cc9cii 9cc046ce4e Further rationalise the use of ColumnIds ...

- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755

(cherry picked from commit 998348e606182eb171dd82b99b647e3dff798b26)

2015-11-01 22:46:18 +11:00

..

model

Further rationalise the use of ColumnIds

2015-11-01 22:46:18 +11:00

view

Further rationalise the use of ColumnIds

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