Marc Zinnschlag 73ab89bf70 merge references tables ...

(cherry picked from commit a97a632aa76c3b7499ae170b689676d2f32b8550)

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

..

model

merge references tables

2015-11-01 13:39:56 +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