cc9cii 71077fda6a Disable toolbar context menu. Should resolve bug #2953. ...

(cherry picked from commit 64821b0785a306f90e4f2f3be9c6a8fa61d440eb)

2015-11-01 22:48:01 +11:00

..

model

Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930.

2015-11-01 22:47:47 +11:00

view

Disable toolbar context menu. Should resolve bug #2953.

2015-11-01 22:48:01 +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