Marc Zinnschlag 44020df65f made return type of ESMTerrain::Storage::getLand const ...

(cherry picked from commit febf611c827a257a4d4000b601f9ef413f2f8012)

2015-11-01 13:40:56 +11:00

..

model

additional safety check for land texture listing merge stage

2015-11-01 13:40:45 +11:00

view

made return type of ESMTerrain::Storage::getLand const

2015-11-01 13:40:56 +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