michal 845469b15d Merge branch 'develop' into solarsystem2 ...

Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp

2014-11-26 13:42:36 -05:00

..

bind_keys.lua

Added key binding from Lua possible

2014-11-17 17:02:40 +01:00

default_keybinding.lua

More work in preparing for lua-based keyboard controller

2014-10-14 00:08:26 +02:00

default_startup.lua

Merge branch 'develop' into solarsystem2

2014-11-26 13:42:36 -05:00