Merge pull request #1152 from elect86/patch-6
authorAlexander Gessler <alexander.gessler@gmx.net>
Thu, 26 Jan 2017 20:04:14 +0000 (21:04 +0100)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2017 20:04:14 +0000 (21:04 +0100)
Update ColladaParser.cpp


Trivial merge