Merge branch 'development' into fix467_exportCollada1831/head
commit06f32342ab9f9bbc5617edfd6fe3e7d92322e166
authorAreloch <areloch@gmail.com>
Sat, 10 Dec 2016 03:09:12 +0000 (9 21:09 -0600)
committerGitHub <noreply@github.com>
Sat, 10 Dec 2016 03:09:12 +0000 (9 21:09 -0600)
tree9f12a8a063b0cddf7d8d842d11cce5ad8c3d4c82
parentf610c7ab2418fa0c74224675d3a904312ed2db9a
parentbcce32a74c4caa49c720efcd973e162333363253
Merge branch 'development' into fix467_exportCollada