projects / platform / upstream / assimp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eba06f0 0a8966a)
Merge pull request #1212 from aoowweenn/umw_dev
authorKim Kulling <kimkulling@users.noreply.github.com>
Wed, 17 May 2017 10:01:46 +0000 (12:01 +0200)
committerGitHub <noreply@github.com>
Wed, 17 May 2017 10:01:46 +0000 (12:01 +0200)
MikuMikuDance Format

1  2 
code/AssbinLoader.cpp patch | diff1 | diff2 | blob | history
code/AssbinLoader.h patch | diff1 | diff2 | blob | history
code/CMakeLists.txt patch | diff1 | diff2 | blob | history
code/ColladaExporter.cpp patch | diff1 | diff2 | blob | history
code/ColladaExporter.h patch | diff1 | diff2 | blob | history
code/ImporterRegistry.cpp patch | diff1 | diff2 | blob | history
test/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc code/AssbinLoader.cpp
Simple merge
diff --cc code/AssbinLoader.h
Simple merge
diff --cc code/CMakeLists.txt
Simple merge
diff --cc code/ColladaExporter.cpp
Simple merge
diff --cc code/ColladaExporter.h
Simple merge
diff --cc code/ImporterRegistry.cpp
Simple merge
diff --cc test/CMakeLists.txt
Simple merge
Domain: Graphics System / Uncategorized;