Marc Zinnschlag 14708e181c more cleanup ... (cherry picked from commit 659b87b25f) Conflicts: apps/opencs/view/doc/view.hpp		2015-11-01 21:35:43 +11:00
..
model	Fix tab indentations in apps/ and components/	2015-11-01 21:34:23 +11:00
view	more cleanup	2015-11-01 21:35:43 +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