diff options
| author | Dreammaster | 2013-02-15 08:25:09 -0500 |
|---|---|---|
| committer | Dreammaster | 2013-02-15 08:25:09 -0500 |
| commit | bb3285d933419b6bdefadc55a6e320855ff0dd27 (patch) | |
| tree | 2df613c52f854c33cff660ed1b064e2996ed80bb /engines/composer | |
| parent | d1a19a1d4c3e20b57250e73141d81e8d9b44a2a1 (diff) | |
| parent | adc338cd719179a94ff470b28e9584262d7b47e8 (diff) | |
| download | scummvm-rg350-bb3285d933419b6bdefadc55a6e320855ff0dd27.tar.gz scummvm-rg350-bb3285d933419b6bdefadc55a6e320855ff0dd27.tar.bz2 scummvm-rg350-bb3285d933419b6bdefadc55a6e320855ff0dd27.zip | |
Merge branch 'master' into hopkins
Diffstat (limited to 'engines/composer')
| -rw-r--r-- | engines/composer/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/composer/resource.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index 835f3c5683..8411441c60 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -374,7 +374,7 @@ static const ComposerGameDescription gameDescriptions[] = { using namespace Composer; // we match from data too, to stop detection from a non-top-level directory -const static char *directoryGlobs[] = { +static const char *directoryGlobs[] = { "data", "liam", "programs", diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp index 83e49971fb..fa29cc886b 100644 --- a/engines/composer/resource.cpp +++ b/engines/composer/resource.cpp @@ -400,4 +400,4 @@ void OldPipe::nextFrame() { _currFrame++; } -} // End of namespace Composer +} // End of namespace Composer |