projects / platform / upstream / assimp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 855031d 302b804)
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)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Domain: Graphics System / Uncategorized;