mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 21:26:41 +00:00
Code Issues Releases Wiki Activity
openmw/apps/opencs
History
cc9cii 007c733578 Resolve merge issues and add back user preference setting for auto selecting a modified record. 
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
2015-11-07 07:17:46 +11:00
..
model Resolve merge issues and add back user preference setting for auto selecting a modified record. 2015-11-07 07:17:46 +11:00
view Resolve merge issues and add back user preference setting for auto selecting a modified record. 2015-11-07 07:17:46 +11:00
CMakeLists.txt Fix namespace, add file to CMakeLists.txt 2015-11-01 22:34:49 +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