Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3...

author Kim Kulling <kim.kulling@googlemail.com>

Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)

committer Kim Kulling <kim.kulling@googlemail.com>

Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
author Kim Kulling <kim.kulling@googlemail.com>
Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
committer Kim Kulling <kim.kulling@googlemail.com>
Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
diff --cc code/CMakeLists.txt
Simple merge
diff --cc code/DefaultIOStream.cpp
Simple merge
diff --cc code/StreamReader.h
Simple merge
diff --cc port/AndroidJNI/AndroidJNIIOSystem.cpp
Simple merge
author	Kim Kulling <kim.kulling@googlemail.com>
	Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
committer	Kim Kulling <kim.kulling@googlemail.com>
	Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)
		1	2
code/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
code/DefaultIOStream.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/StreamReader.h	patch \|	diff1 \|	diff2 \|	blob \| history
port/AndroidJNI/AndroidJNIIOSystem.cpp	patch \|	diff1 \|	diff2 \|	blob \| history