Merge pull request #1 from assimp/master
authorJohn Carlson <yottzumm@gmail.com>
Thu, 17 Dec 2015 14:53:56 +0000 (09:53 -0500)
committerJohn Carlson <yottzumm@gmail.com>
Thu, 17 Dec 2015 14:53:56 +0000 (09:53 -0500)
commit0ebab2ef2347e9a05f005a72c6b3a638786c55c8
treeec0c515293d4e5a83aa7268cacc3c324a929c068
parent9538b7ed425f7211ee92fa0d6e1d4d03bb2df84b
parentf75b919d423cefc8f7e98492e02cb1aef3265910
Merge pull request #1 from assimp/master

Pull from master 12-17-2015