Marc Zinnschlag dcf1f1515a handle missing land texture records properly during merge ...

(cherry picked from commit 09ec60fe2a7b2cce91ee5f2271db4479b97ae228)

2015-11-01 18:56:43 +11:00

..

model

handle missing land texture records properly during merge

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