Alexander Bock a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop ...

Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua

2016-06-01 19:46:23 +02:00

..

jupiter

First fix for reenabling Jupiter projections

2016-05-31 18:25:57 +02:00

newhorizons

Fix inverted texture problem

2016-04-20 14:28:11 +02:00

newhorizonsfov

Untabify more files

2016-04-27 14:24:58 +02:00

newhorizonspath

Untabify more files

2016-04-27 14:24:58 +02:00

newhorizonstrail

Untabify more files

2016-04-27 14:24:58 +02:00

pluto

Merge remote-tracking branch 'origin/feature/iSWA' into develop

2016-06-01 19:46:23 +02:00