Marc Zinnschlag e5038cbece fixed merge stage order; added proper initialisation ...

(cherry picked from commit b7983d08ba3f238f0cddad467049c87b17a3745f)

2015-11-01 13:40:07 +11:00

..

model

fixed merge stage order; added proper initialisation

2015-11-01 13:40:07 +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