diff options
author | Matthew Hoops | 2011-05-03 17:17:27 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-05-03 17:25:41 -0400 |
commit | 9cb600099f4c29298707787cafad2741a1cd6686 (patch) | |
tree | fb1930fa56b611317831d66442cba19b18d2e57a /engines/testbed/detection.cpp | |
parent | 3b2283daf850605ca897002afbafe44489c35473 (diff) | |
parent | 95a6098f672191dc0792bd4f9bfa18706bbe8e3a (diff) | |
download | scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.gz scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.bz2 scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/testbed/detection.cpp')
-rw-r--r-- | engines/testbed/detection.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 734ed0c22a..b08cca291a 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -23,10 +23,8 @@ * */ -#include "common/config-manager.h" #include "engines/advancedDetector.h" #include "common/system.h" -#include "common/fs.h" #include "base/plugins.h" |