mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity
63284d21a0
OpenMW/apps/opencs
History
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
..
model Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
view whitespaces removed again. 2014-01-27 19:47:54 +01:00
CMakeLists.txt
editor.cpp
editor.hpp
main.cpp