cc9cii 496cdcb51b Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique. ...

(cherry picked from commit 258b2ba29abedf329db1db2c5660cf213445c999)

2015-11-01 20:14:11 +11:00

..

model

Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.

2015-11-01 20:14:11 +11:00

view

removed indirection in OpenMW-CS land record

2015-11-01 18:56:07 +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