Merge branch 'develop' into release/ips

This commit is contained in:
Alexander Bock
2016-06-17 15:46:59 +02:00
+1
View File
@@ -142,3 +142,4 @@ data/scene/rosetta/67P/textures/may9_map.jpg
data/scene/newhorizons/pluto/charon/textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg
data/scene/newhorizons/pluto/charon/textures/cpmap_cyl_HR_0e.jpg
data/scene/volumetricmilkyway/milkyway/
ScriptLog.txt