Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 14 Nov 2016 19:34:52 +0000 (20:34 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 14 Nov 2016 19:34:52 +0000 (20:34 +0100)
commita1f773c3056822ebc0cd0ba4e1b0ab9ae9924375
tree22b2057e8de23cd1a649e602569bce1926ddc943
parent855031d37cf912acf07f1aa7901de6da7af8bf16
parent302b8044c67311acfaa61b9d26d0770a2e1d3f40
Merge branch 'master' of https://github.com/assimp/assimp
CMakeLists.txt