libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a4610df482
scummvm/audio
History
Max Horn a4610df482 Merge branch 'branch-1-3-0' into master 
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
2011-06-01 15:15:31 +02:00
..
decoders ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
mods ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
softsynth Merge branch 'branch-1-3-0' into master 2011-06-01 15:15:31 +02:00
audiostream.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
audiostream.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
fmopl.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
fmopl.h AUDIO: Explicitly instantiate & name RandomSource used by MAME OPL 2011-05-23 12:13:01 +02:00
mididrv.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
mididrv.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
midiparser_smf.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
midiparser_xmidi.cpp ALL: recognise -> recognize 2011-05-25 10:50:47 -04:00
midiparser.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
midiparser.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
midiplayer.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
midiplayer.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
mixer_intern.h AUDIO: Clarify required parameters for mixCallback. 2011-05-16 15:09:05 +02:00
mixer.cpp AUDIO: Clarify required parameters for mixCallback. 2011-05-16 15:09:05 +02:00
mixer.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
module.mk FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4 2011-05-17 20:24:24 +02:00
mpu401.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
mpu401.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
musicplugin.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
musicplugin.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
null.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
null.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
rate_arm_asm.s GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
rate_arm.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
rate.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
rate.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
timestamp.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
timestamp.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00