Marc Zinnschlag 5031d1fbcb disable on-demand loading of land data (for now, maybe) ...

(cherry picked from commit 5be176ee85da349163e161f86693f836fb1b5fdc)

2015-11-01 18:57:18 +11:00

..

model

disable on-demand loading of land data (for now, maybe)

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