cc9cii 2f76a1510e Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879. ...

(cherry picked from commit 45aee1b5088cb110e06540356670b806887f7372)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp

2015-11-01 21:32:34 +11:00

..

model

Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879.

2015-11-01 21:32:34 +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