scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting ... Conflicts: apps/opencs/view/render/instancemode.cpp		2016-01-15 15:46:10 +01:00
..
model	Merge branch 'master' of https://github.com/OpenMW/openmw into lighting	2016-01-15 15:46:10 +01:00
view	Merge branch 'master' of https://github.com/OpenMW/openmw into lighting	2016-01-15 15:46:10 +01:00
CMakeLists.txt	OpenCS: use a separate enum for the toggle buttons	2016-01-11 23:10:16 +01:00
editor.cpp	Read fallback settings in OpenCS	2016-01-11 23:10:16 +01:00
editor.hpp	removed old user settings system	2015-12-15 12:49:55 +01:00
main.cpp	OS X: do not override Qt plugin path	2015-11-14 13:50:01 +01:00