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
..
model	Merge branch 'savedgame'	2014-02-01 18:16:32 +01:00
view	whitespaces removed again.	2014-01-27 19:47:54 +01:00
CMakeLists.txt	Merge remote-tracking branch 'sirherrbatka/referencables_verifer'	2014-01-15 14:29:54 +01:00
editor.cpp	XDG compliant paths	2013-12-26 20:53:51 +01:00
editor.hpp	Fix for file path issues	2013-10-26 22:55:44 -05:00
main.cpp	Change destruction order - fixes a shutdown crash discovered with mesa	2013-12-26 20:53:52 +01:00