Michal Marcinkowski 6ef0181148 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	include/openspace/util/spicemanager.h

2014-12-09 18:04:38 -05:00

..

bind_keys.lua

More work on performance measuring in imgui

2014-12-09 15:49:54 +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

intermediate commit before merge

2014-12-09 17:50:29 -05:00