Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 22:55:14 +0000 (23:55 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 22:55:14 +0000 (23:55 +0100)
1  2 
include/assimp/metadata.h

Simple merge