projects / platform / upstream / assimp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3a3bd9 1724cc9)
Merge branch 'master' into new_obj_stream_handling
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 19:04:02 +0000 (21:04 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 19:04:02 +0000 (21:04 +0200)
1  2 
code/CMakeLists.txt patch | diff1 | diff2 | blob | history
code/ObjFileParser.cpp patch | diff1 | diff2 | blob | history

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