diff options
| author | Max Horn | 2011-06-01 15:15:31 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-01 15:15:31 +0200 |
| commit | a4610df4825a89ceda39bf1156d1b97a37cceac8 (patch) | |
| tree | 8c1fea3f50126079ba64ebf108cb0fd588378960 /gui/massadd.cpp | |
| parent | a4d105c902ce1b24c4edd1f3eb43b995bc46c0dd (diff) | |
| parent | afe1a77d573ea15c45848c722732f9e84221c669 (diff) | |
| download | scummvm-rg350-a4610df4825a89ceda39bf1156d1b97a37cceac8.tar.gz scummvm-rg350-a4610df4825a89ceda39bf1156d1b97a37cceac8.tar.bz2 scummvm-rg350-a4610df4825a89ceda39bf1156d1b97a37cceac8.zip | |
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
Diffstat (limited to 'gui/massadd.cpp')
| -rw-r--r-- | gui/massadd.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/massadd.cpp b/gui/massadd.cpp index 7b641d71e5..861be970c4 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -31,7 +31,7 @@ #include "gui/widget.h" #include "gui/widgets/list.h" - +#ifndef DISABLE_MASS_ADD namespace GUI { /* @@ -264,3 +264,4 @@ void MassAddDialog::handleTickle() { } // End of namespace GUI +#endif // DISABLE_MASS_ADD |