1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 08:39:42 +00:00
openmw/apps
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
..
bsatool Fix bsatool warning 2013-12-05 15:46:33 +01:00
esmtool Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 18:28:35 +01:00
launcher minor cleanup 2014-01-14 12:46:53 +04:00
mwiniimporter Feature #1086: Import blood models/textures in MWIniImporter 2014-01-17 10:55:46 +01:00
opencs Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
openmw Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
openmw_test_suite Added unittests for FileFinder::FileFinderStrict class. 2013-08-31 00:13:42 +02:00
doc.hpp first set of additional doxygen comments 2010-09-25 15:03:53 +02:00