Marc Zinnschlag 62daecadf5 fixed record state issues after merge ...

(cherry picked from commit 845cafd61c12142a353119a6304845370037d7a5)

2015-11-01 13:39:44 +11:00

..

model

fixed record state issues after merge

2015-11-01 13:39:44 +11:00

view

create merged document and open a view for it (document is still empty at this point)

2015-11-01 13:31:28 +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