mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-08 09:37:53 +00:00
Code Issues Projects Releases Wiki Activity
03cf383be7
OpenMW/apps
History
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
..
bsatool
esmtool Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 18:28:35 +01:00
launcher minor cleanup 2014-01-14 12:46:53 +04:00
mwiniimporter Feature #1086: Import blood models/textures in MWIniImporter 2014-01-17 10:55:46 +01:00
opencs Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 18:28:35 +01:00
openmw Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 18:28:35 +01:00
openmw_test_suite
doc.hpp