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
..
2013-07-31 15:46:23 +02:00
2013-07-31 15:46:23 +02:00
2013-02-17 15:56:22 +01:00
2013-02-17 15:56:22 +01:00
2013-02-17 15:56:22 +01:00
2013-11-13 14:02:15 +01:00
2013-04-28 14:59:15 +02:00
2013-04-28 14:59:15 +02:00
2013-11-17 23:31:08 +01:00
2013-02-17 15:56:22 +01:00
2014-01-19 11:43:23 +01:00
2013-02-17 15:56:22 +01:00
2014-01-03 23:33:14 +01:00
2013-03-07 14:00:13 +01:00
2014-01-08 18:39:44 +01:00
2013-02-17 15:56:22 +01:00
2013-03-23 08:16:46 +01:00
2013-03-23 08:16:46 +01:00
2013-03-30 15:51:07 +01:00
2013-03-30 15:51:07 +01:00
2014-01-07 19:58:17 +01:00
2013-02-17 15:56:22 +01:00
2013-02-17 15:56:22 +01:00
2013-02-17 15:56:22 +01:00
2014-01-12 14:03:11 +01:00
2013-02-17 15:56:22 +01:00
2014-01-21 12:30:15 +01:00
2013-11-13 14:02:15 +01:00
2014-01-01 22:37:52 +01:00
2014-01-27 13:27:42 +01:00
2014-01-27 13:27:42 +01:00
2014-02-01 17:36:23 +01:00
2014-01-27 13:27:42 +01:00
2014-02-01 18:16:32 +01:00
2014-02-01 18:16:32 +01:00
2014-02-01 18:16:32 +01:00
2014-02-01 18:16:32 +01:00
2013-11-04 10:36:22 +01:00
2012-01-24 11:24:05 +01:00
2013-09-29 09:11:57 +02:00
2013-09-29 09:11:57 +02:00
2014-01-18 15:06:58 +01:00
2013-12-07 13:17:28 +01:00
2013-08-08 22:34:53 -07:00
2013-08-08 22:34:53 -07:00
2013-03-15 10:26:04 +01:00
2013-03-15 10:26:04 +01:00
2013-12-12 12:19:25 +01:00
2013-12-12 12:19:25 +01:00
2014-02-01 18:16:32 +01:00
2014-02-01 18:16:32 +01:00
2014-01-30 11:50:13 +01:00
2014-01-31 13:25:32 +01:00
2013-12-05 13:21:26 +01:00
2013-01-13 17:05:12 +00:00
2014-01-12 16:58:06 +01:00
2013-02-17 15:56:22 +01:00
2013-09-29 09:11:57 +02:00
2013-09-29 09:11:57 +02:00
2014-01-17 15:47:34 +01:00
2013-08-25 16:08:45 -07:00
2014-01-24 18:28:35 +01:00
2014-01-16 12:03:23 +01:00
2014-01-31 13:25:32 +01:00
2014-01-31 13:25:32 +01:00
2012-12-23 23:23:24 +04:00
2014-01-16 12:03:23 +01:00
2014-01-16 12:03:23 +01:00
2014-02-01 18:16:32 +01:00
2014-01-06 00:23:17 +01:00
2014-02-01 18:16:32 +01:00
2014-01-25 16:33:39 +01:00
2012-08-11 11:38:26 +02:00
2012-05-18 22:04:22 +02:00
2014-01-15 14:53:28 +01:00
2014-01-01 14:57:14 +01:00
2014-02-01 18:16:32 +01:00
2014-02-01 18:16:32 +01:00