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	create merged document and open a view for it (document is still empty at this point)	2015-11-01 13:31:28 +11:00
filter	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
settings	Rewording of the user setting for extended configuration	2015-07-30 09:32:58 +10: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
world	Add missing includes to columnimp.hpp	2015-09-08 06:48:04 +10:00