Marc Zinnschlag ab0b5932f7 added user settings option to toggle toolbars in single-record subviews ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp		2015-07-27 15:15:05 +10:00
..
doc	Merge branch 'meta'	2015-06-26 18:37:39 +02:00
filter	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
settings	added user settings option to toggle toolbars in single-record subviews	2015-07-27 15:15:05 +10:00
tools	Merge remote-tracking branch 'cc9cii/master'	2015-06-25 14:06:22 +02:00
world	Count of nested columns can be retrieved for a collection with no records	2015-07-27 14:25:02 +10:00