Michal Marcinkowski f6d382f9f9 Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge ...

Conflicts:
	src/rendering/renderengine.cpp

2015-05-04 20:27:52 -04:00

..

bind_keys.lua

Fixes to trails, fov and adding some keybindings

2015-05-04 20:15:34 -04:00

default_settings.lua

Fixed crash with changing coordinate systems

2015-02-26 18:07:37 +01:00

default_startup.lua

Default startup + renderengine fixes

2015-05-04 19:52:56 -04:00