1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-05 11:11:32 +00:00
openmw/apps/opencs
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
..
model create merged document and open a view for it (document is still empty at this point) 2015-11-01 13:31:28 +11:00
view create merged document and open a view for it (document is still empty at this point) 2015-11-01 13:31:28 +11:00
CMakeLists.txt create merged document and open a view for it (document is still empty at this point) 2015-11-01 13:31:28 +11:00
editor.cpp create merged document and open a view for it (document is still empty at this point) 2015-11-01 13:31:28 +11:00
editor.hpp added UI for merge tool (merge tool itself is still missing) 2015-11-01 13:22:42 +11:00
main.cpp Remove empty line at the beginning of files 2015-09-08 06:40:06 +10:00