Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Wed, 9 Dec 2015 22:50:00 +0000 (23:50 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Wed, 9 Dec 2015 22:50:00 +0000 (23:50 +0100)
commit9a6049d98df50c86488ec3553acdad8adf6fffaa
tree3863bf33d4a88b795525f482e3753f333597bde2
parent35fafe3a6f5476ae0c552c5ddc985169959720db
parentbf4ca8162dd3ff792ea53f957853deadbb25adf2
Merge branch 'master' of https://github.com/assimp/assimp