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
..
audiere_decoder.cpp
audiere_decoder.hpp
ffmpeg_decoder.cpp
ffmpeg_decoder.hpp
mpgsnd_decoder.cpp
mpgsnd_decoder.hpp
openal_output.cpp	Fix a leftover of the old coordinate system	2014-01-14 03:26:56 +01:00
openal_output.hpp
sound_decoder.hpp
sound_output.hpp
sound.hpp
soundmanagerimp.cpp	Merge branch 'savedgame'	2014-02-01 18:16:32 +01:00
soundmanagerimp.hpp	Merge branch 'savedgame'	2014-02-01 18:16:32 +01:00