cc9cii 0ec4af4210 Re-add mistakenly removed line and fix a silly typo. ... (cherry picked from commit 77471d1592)		2015-11-02 06:25:46 +11:00
..
model	Re-add mistakenly removed line and fix a silly typo.	2015-11-02 06:25:46 +11:00
view	Re-add mistakenly removed line and fix a silly typo.	2015-11-02 06:25: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