aboutsummaryrefslogtreecommitdiff
path: root/engines/advancedDetector.h
diff options
context:
space:
mode:
authorPaul Gilbert2012-10-31 09:34:38 +1100
committerPaul Gilbert2012-10-31 09:34:38 +1100
commit798ddfaab500bb212f620cf095328eee5eb140a4 (patch)
tree55b5d0b90affd88063c04b7ff62fea1616b83e80 /engines/advancedDetector.h
parentef663f95a516d8fe47a245653d418c047361281a (diff)
parentfdc80fd952120ecb8a4941edd4c2e404cdc5fa33 (diff)
downloadscummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.gz
scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.bz2
scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.zip
Merge branch 'master' into hopkins
Diffstat (limited to 'engines/advancedDetector.h')
-rw-r--r--engines/advancedDetector.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 8c19d03691..3eec33abe5 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -194,7 +194,7 @@ protected:
/**
* A map containing all the extra game GUI options the engine supports.
- */
+ */
const ADExtraGuiOptionsMap * const _extraGuiOptions;
/**
@@ -212,7 +212,7 @@ protected:
*
* Used to override gameid.
* This is a recommended setting to prevent global gameid pollution.
- * With this option set, the gameid effectively turns into engineid.
+ * With this option set, the gameid effectively turns into engineid.
*
* FIXME: This field actually removes a feature (gameid) in order to
* address a more generic problem. We should find a better way to