Merge branch 'master' into adsk-contrib-fix-std-stream-overflow

author ndotl <haik.lorenz+ndotl@gmail.com>

Mon, 9 Oct 2017 14:00:46 +0000 (16:00 +0200)

committer GitHub <noreply@github.com>

Mon, 9 Oct 2017 14:00:46 +0000 (16:00 +0200)
author ndotl <haik.lorenz+ndotl@gmail.com>
Mon, 9 Oct 2017 14:00:46 +0000 (16:00 +0200)
committer GitHub <noreply@github.com>
Mon, 9 Oct 2017 14:00:46 +0000 (16:00 +0200)
diff --cc code/ColladaExporter.cpp
Simple merge
diff --cc code/ObjExporter.cpp
Simple merge
diff --cc code/PlyExporter.cpp
Simple merge
diff --cc code/STLExporter.cpp
Simple merge
diff --cc code/XFileExporter.cpp
Simple merge
author	ndotl <haik.lorenz+ndotl@gmail.com>
	Mon, 9 Oct 2017 14:00:46 +0000 (16:00 +0200)
committer	GitHub <noreply@github.com>
	Mon, 9 Oct 2017 14:00:46 +0000 (16:00 +0200)
		1	2
code/ColladaExporter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/ObjExporter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/PlyExporter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/STLExporter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/XFileExporter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history