aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorMatthew Hoops2012-05-04 23:32:29 -0400
committerMatthew Hoops2012-05-04 23:32:29 -0400
commite80d622fa5b3a834faff22ac777838388c0cdf10 (patch)
treef19d5a4b8725796a8bad28dad9b29c7313e5c2ff /devtools
parent68438a2919df2756942193d9b1b77496828fd45a (diff)
parente5808c740a62cb87a1ceeef7873af3b21e912c73 (diff)
downloadscummvm-rg350-e80d622fa5b3a834faff22ac777838388c0cdf10.tar.gz
scummvm-rg350-e80d622fa5b3a834faff22ac777838388c0cdf10.tar.bz2
scummvm-rg350-e80d622fa5b3a834faff22ac777838388c0cdf10.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'devtools')
-rw-r--r--devtools/create_project/create_project.cpp8
-rw-r--r--devtools/scumm-md5.txt1
2 files changed, 5 insertions, 4 deletions
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 293cc0b2de..df220f0934 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -654,14 +654,14 @@ void displayHelp(const char *exe) {
"\n"
"Engines settings:\n"
" --list-engines list all available engines and their default state\n"
- " --enable-engine enable building of the engine with the name \"engine\"\n"
- " --disable-engine disable building of the engine with the name \"engine\"\n"
+ " --enable-engine=<name> enable building of the engine with the name \"name\"\n"
+ " --disable-engine=<name> disable building of the engine with the name \"name\"\n"
" --enable-all-engines enable building of all engines\n"
" --disable-all-engines disable building of all engines\n"
"\n"
"Optional features settings:\n"
- " --enable-name enable inclusion of the feature \"name\"\n"
- " --disable-name disable inclusion of the feature \"name\"\n"
+ " --enable-<name> enable inclusion of the feature \"name\"\n"
+ " --disable-<name> disable inclusion of the feature \"name\"\n"
"\n"
" There are the following features available:\n"
"\n";
diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 01d806a484..7d2ea94f10 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -590,6 +590,7 @@ FreddisFunShop Freddi Fish's One-Stop Fun Shop
catalog Humongous Interactive Catalog
11e6e244078ff09b0f3832e35420e0a7 -1 en Windows - Demo - khalek, sev
037385a953789190298494d92b89b3d0 -1 en Windows HE 72 Demo - khalek, sev
+ f7635a0e2ab82c9a0f9ace5f232a488f -1 en Windows HE 72 Demo - Kirben
a56e8d9d4281c53c3f63c9bd22a59e21 10978342 en All HE CUP Preview George Kormendi
74da3494fbe1a7d20213b0afe0954755 10841544 fr All HE CUP Preview - George Kormendi
4c4820518e16e1a0e3616a3b021a04f3 10927456 de All HE CUP Preview - Kirben