Marc Zinnschlag 3eef192e4d create merged document and open a view for it (document is still empty at this point) ... (cherry picked from commit 1b663f01af) Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/doc/documentmanager.cpp		2015-11-01 13:31:28 +11:00
..
doc	disable merge menu item when a merge is already in progress	2015-11-01 13:23:09 +11:00
filter	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
render	Fix the ESM::LandTexture NAME being discarded on loading	2015-09-08 06:42:45 +10: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	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
world	Columns with Display_Boolean use Combobox editor even for non-boolean values	2015-09-08 06:46:21 +10:00