- more vc12 fixes
Merge git://github.com/bjowi/assimp
Removed /assimp suffix from pkgconfig includedir - works better when importing <assimp/whatever.h>
Merge remote-tracking branch 'upstream/master'