Marc Zinnschlag febf611c82 made return type of ESMTerrain::Storage::getLand const		2015-08-31 14:17:11 +02:00
..
model	additional safety check for land texture listing merge stage	2015-08-31 11:10:58 +02:00
view	made return type of ESMTerrain::Storage::getLand const	2015-08-31 14:17:11 +02:00
CMakeLists.txt	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
editor.cpp	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
main.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-22 20:09:02 +02:00