1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 06:39:49 +00:00
OpenMW/apps/opencs
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
editor.hpp
main.cpp Merge branch 'openmw-27' 2013-11-30 09:45:41 +01:00