mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-19 03:39:58 +00:00
Code Issues Projects Releases Wiki Activity
OpenMW/apps/opencs
History
Marc Zinnschlag e4381c3ec8 added merge operation (doesn't do anything yet) 
(cherry picked from commit 904ad949524864239f4b1f428d03a947360728a0)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
2015-11-01 13:25:34 +11:00
..
model
added merge operation (doesn't do anything yet)
2015-11-01 13:25:34 +11:00
view
added merge operation (doesn't do anything yet)
2015-11-01 13:25:34 +11:00
CMakeLists.txt
added merge operation (doesn't do anything yet)
2015-11-01 13:25:34 +11:00
editor.cpp
added UI for merge tool (merge tool itself is still missing)
2015-11-01 13:22:42 +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