Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ...

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg

2013-12-07 12:27:06 +01:00

..

model

Merge branch 'master' into savedgame

2013-12-07 12:27:06 +01:00

view

journals subview was bound to the wrong universal ID type

2013-12-02 16:25:26 +01:00

CMakeLists.txt

Merge branch 'openmw-27'

2013-11-30 09:45:41 +01:00

editor.cpp

Merge remote-tracking branch 'scrawl/master'

2013-11-10 11:49:48 +01:00

editor.hpp

Fix for file path issues

2013-10-26 22:55:44 -05:00

main.cpp

Merge branch 'openmw-27'

2013-11-30 09:45:41 +01:00