Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3...
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
commit1c6145b39e4df9fdfc3740b879ba56d181919903
tree42436fc7fbaaebc3a8434a211baa04e4401bc2f5
parentd402825d03517b94cf4eac8c6caa9514f9e7562f
parent5dd1bb9d6c87993a2436d381dfe333159161892d
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
code/CMakeLists.txt
code/DefaultIOStream.cpp
code/StreamReader.h
port/AndroidJNI/AndroidJNIIOSystem.cpp