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
..
inputmanagerimp.cpp	Merge branch 'savedgame'	2014-02-01 18:16:32 +01:00
inputmanagerimp.hpp	Rewrite some awful code	2014-01-11 00:24:21 +01:00