cc9cii f08680ebcd Disable context menu for fixed size sub-tables. Should resolve bug #2932. ... (cherry picked from commit 80869d9bae) Conflicts: apps/opencs/view/world/dialoguesubview.cpp apps/opencs/view/world/nestedtable.cpp apps/opencs/view/world/nestedtable.hpp		2015-11-02 06:25:31 +11:00
..
model	Disable context menu for fixed size sub-tables. Should resolve bug #2932.	2015-11-02 06:25:31 +11:00
view	Disable context menu for fixed size sub-tables. Should resolve bug #2932.	2015-11-02 06:25:31 +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