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
..
doc	final batch of changing over user settings usage to the new system	2015-12-15 12:44:04 +01:00
filter	Fixed filter reapplication on Description column change and on State	2015-10-16 11:32:22 +10:00
prefs	fixed user settings not being saved when last document window is closed while user settings window is still open	2015-12-15 14:56:29 +01:00
render	Merge branch 'master' of https://github.com/OpenMW/openmw into lighting	2016-01-15 15:46:10 +01:00
tools	third batch of changing over user settings usage to the new system	2015-12-15 10:40:00 +01:00
widget	OpenCS: use a separate enum for the toggle buttons	2016-01-11 23:10:16 +01:00
world	Fix cppcheck warnings	2016-01-03 20:19:38 +01:00