scrawl e2ee3b2497 Merge branch 'master' of https://github.com/OpenMW/openmw ...

Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp

2014-08-12 19:53:37 +02:00

..

storage.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw

2014-08-12 19:53:37 +02:00

storage.hpp

Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597)

2014-08-08 15:46:33 +02:00