fix: pre-compiled header conflicts across different build configurations
Merge branch 'master' of https://github.com/tszirr/assimp
update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 )

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
bugfix : add cmakein file for zlib.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
bugfix: add missing zconf file for cmake.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Update Readme.md
Update CMakeLists.txt for zlib to build on MSVC again, closes #170.
Merge pull request #171 from assimp/zip-cmake-fixes

Update CMakeLists.txt for zlib to build on MSVC again, closes #170.
Apply patch from #168. Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6eae31f9ec063bd685e2c652ca97aedb4, but leave all Zlib install stuff commented.
Merge pull request #172 from assimp/zip-cmake-fixes

ZIP fixes from #168, modified to keep the Windows build alive
PyAssimp optimize: load Armadillo: 33.8s -> 6.7s
Merge pull request #175 from Eximius/master

PyAssimp optimize: load Armadillo: 33.8s -> 6.7s
bugfix : fix Issue #176 cmake variables are now using quotes.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Fix to support FBX 2011 (7100)
Merge pull request #181 from inohiro/master

 Enable support of FBX 2011 (7100)
added additional search paths for dll on windows
typo fix: loose -> lose
Merge pull request #183 from erich666/master

typo fix: loose -> lose
Merge pull request #182 from mikedh/master

added additional search paths for dll on windows
Fixed mingw cross compiler issues.