libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a4610df482
scummvm/gui
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
..
themes I18N: Update translations.dat 2011-05-24 22:32:03 +01:00
widgets ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
about.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
about.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Actions.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Actions.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
browser_osx.mm GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
browser.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
browser.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
chooser.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
chooser.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
console.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
console.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
credits.h CREDITS: Temporarily retire Jubanka, add CeRiAl 2011-05-25 00:05:16 +02:00
debugger.cpp BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER 2011-05-25 13:24:37 +02:00
debugger.h BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER 2011-05-25 13:24:37 +02:00
dialog.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
dialog.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
error.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
error.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
gui-manager.cpp Merge branch 'branch-1-3-0' into master 2011-06-01 15:15:31 +02:00
gui-manager.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Key.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Key.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
KeysDialog.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
KeysDialog.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
launcher.cpp Merge branch 'branch-1-3-0' into master 2011-06-01 15:15:31 +02:00
launcher.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
massadd.cpp Merge branch 'branch-1-3-0' into master 2011-06-01 15:15:31 +02:00
massadd.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
message.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
message.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
module.mk GUI: Rename gui/GuiManager.* to gui/gui-manager.* 2010-11-16 10:19:01 +00:00
object.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
object.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
options.cpp Merge branch 'branch-1-3-0' into master 2011-06-01 15:15:31 +02:00
options.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
saveload.cpp Merge branch 'branch-1-3-0' into master 2011-06-01 15:15:31 +02:00
saveload.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
themebrowser.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
themebrowser.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeEngine.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeEngine.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeEval.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeEval.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeLayout.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeLayout.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeParser.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
ThemeParser.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Tooltip.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Tooltip.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
widget.cpp GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
widget.h GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00