cc9cii 007c733578 Resolve merge issues and add back user preference setting for auto selecting a modified record. ... (cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b) Conflicts: apps/opencs/model/settings/usersettings.cpp		2015-11-07 07:17:46 +11:00
..
doc	Fix issue where mandatory effects field was allowed to be empty (and vice versa)	2015-11-01 23:09:06 +11:00
filter	Fixed filter reapplication on Description column change and on State	2015-11-01 22:50:37 +11:00
render	removed indirection in OpenMW-CS land record	2015-11-01 18:56:07 +11:00
settings	Add support to build with Qt5 (Task #2665)	2015-06-12 15:13:42 +02:00
tools	create merged document and open a view for it (document is still empty at this point)	2015-11-01 13:31:28 +11:00
widget	Fix tab indentations in apps/ and components/	2015-11-01 21:34:23 +11:00
world	Resolve merge issues and add back user preference setting for auto selecting a modified record.	2015-11-07 07:17:46 +11:00