cc9cii 12a8692cdb Fix include file issue. ...

(cherry picked from commit 7f477e2fae47bdfe78ac17b2622ed2fdd844fd98)

2015-11-02 18:50:02 +11:00

..

model

Fix include file issue.

2015-11-02 18:50:02 +11:00

view

Move TableEditModes enum inside a class scope.

2015-11-02 18:45:17 +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