Marc Zinnschlag a445683312 Merge branch 'mergetool' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/tools/tools.cpp		2015-09-11 13:22:15 +02:00
..
model	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
view	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
CMakeLists.txt	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
editor.cpp	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
main.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00