projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
47dd1eb
1c78f1b
)
Merge pull request #1027 from corporateshark/master
author
Kim Kulling
<kimkulling@users.noreply.github.com>
Mon, 10 Oct 2016 17:39:40 +0000
(19:39 +0200)
committer
GitHub
<noreply@github.com>
Mon, 10 Oct 2016 17:39:40 +0000
(19:39 +0200)
Fixed: unzip.h was still included even if the D3MF importer is disabled
Trivial merge