projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
855031d
302b804
)
Merge branch 'master' of https://github.com/assimp/assimp
author
Kim Kulling
<kim.kulling@googlemail.com>
Mon, 14 Nov 2016 19:34:52 +0000
(20:34 +0100)
committer
Kim 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