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
..
main.cpp	SAMSUNGTV: Fix build on non-SDL platforms	2011-05-24 20:58:36 +02:00
module.mk	BUILD: Unify build & configure rules for SDL based backends	2011-05-25 13:21:01 +02:00
samsungtv.cpp	SAMSUNGTV: Fix build	2011-05-24 21:32:24 +02:00
samsungtv.h	SAMSUNGTV: Update port	2011-05-24 20:34:45 +02:00