mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-26 06:39:43 +00:00
Code Issues Releases Wiki Activity
13876 commits 108 branches 68 tags 135 MiB
Commit graph

2 commits

Author SHA1 Message Date
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
Marc Zinnschlag
e4381c3ec8 added merge operation (doesn't do anything yet) 
(cherry picked from commit 904ad94952)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-11-01 13:25:34 +11:00