cc9cii 41f2ffdebb Rationalise the use of ColumnIds ...

(cherry picked from commit c4a900ca2c9b98267c9a507bb887829373fc9193)

Conflicts:
	apps/opencs/model/world/refidcollection.cpp

2015-11-01 20:28:13 +11:00

..

model

Rationalise the use of ColumnIds

2015-11-01 20:28:13 +11:00

view

Rationalise the use of ColumnIds

2015-11-01 20:28:13 +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