diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/composer/composer.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/composer/composer.cpp')
| -rw-r--r-- | engines/composer/composer.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp index f070338978..73d97e100d 100644 --- a/engines/composer/composer.cpp +++ b/engines/composer/composer.cpp @@ -21,13 +21,9 @@ */ #include "common/scummsys.h" -#include "common/config-manager.h" #include "common/events.h" -#include "common/file.h" #include "common/random.h" -#include "common/fs.h" #include "common/keyboard.h" -#include "common/substream.h" #include "graphics/cursorman.h" #include "graphics/surface.h" @@ -35,9 +31,6 @@ #include "graphics/wincursor.h" #include "engines/util.h" -#include "engines/advancedDetector.h" - -#include "audio/audiostream.h" #include "composer/composer.h" #include "composer/graphics.h" |