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
..
2014-01-13 10:17:10 +01:00
2014-01-29 15:37:27 +01:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2011-11-21 14:08:44 +01:00
2014-02-01 18:16:32 +01:00
2013-08-06 20:38:41 -04:00
2013-03-22 05:50:54 +01:00
2012-06-16 13:06:23 +02:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2014-01-19 11:43:23 +01:00
2013-08-06 20:38:41 -04:00
2014-01-15 14:53:29 +01:00
2013-08-06 20:38:41 -04:00
2014-01-08 18:39:44 +01:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2013-12-15 16:16:50 +01:00
2013-12-15 16:16:50 +01:00
2014-01-15 14:53:28 +01:00
2013-08-06 20:38:41 -04:00
2014-01-24 18:28:35 +01:00
2014-01-09 02:21:03 +01:00
2013-12-15 16:16:50 +01:00
2013-12-15 16:16:50 +01:00
2014-02-01 18:16:32 +01:00
2013-08-06 20:38:41 -04:00
2014-01-09 02:21:03 +01:00
2014-01-24 18:28:35 +01:00
2013-12-12 13:15:38 +01:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2014-01-15 15:50:45 +01:00
2013-08-06 20:38:41 -04:00
2014-01-15 14:53:28 +01:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00