projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0414b9c
0434f5a
)
Merge pull request #1152 from elect86/patch-6
author
Alexander Gessler
<alexander.gessler@gmx.net>
Thu, 26 Jan 2017 20:04:14 +0000
(21:04 +0100)
committer
GitHub
<noreply@github.com>
Thu, 26 Jan 2017 20:04:14 +0000
(21:04 +0100)
Update ColladaParser.cpp
Trivial merge