aboutsummaryrefslogtreecommitdiff
path: root/graphics/imageman.cpp
diff options
context:
space:
mode:
authorDavid Corrales2007-05-26 20:23:24 +0000
committerDavid Corrales2007-05-26 20:23:24 +0000
commit3646c968c9578c2a94d65ebd5fb06ec835f8c51d (patch)
tree8b57b339ebb31a1d7a67f1678aa5dc5c7759070a /graphics/imageman.cpp
parentd1f56d93f934150f4b579c2e90564e2bf035f113 (diff)
parentac45c5b33d834acbc9718f89be76e49d403a4d2c (diff)
downloadscummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.gz
scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.bz2
scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.zip
Merged the fs branch with trunk. r26472:26948
svn-id: r26949
Diffstat (limited to 'graphics/imageman.cpp')
-rw-r--r--graphics/imageman.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/graphics/imageman.cpp b/graphics/imageman.cpp
index d4fc9da72d..1145dd262f 100644
--- a/graphics/imageman.cpp
+++ b/graphics/imageman.cpp
@@ -23,8 +23,6 @@
#include "graphics/imageman.h"
#include "graphics/surface.h"
-DECLARE_SINGLETON(Graphics::ImageManager);
-
namespace Graphics {
ImageManager::ImageManager() : _surfaces()
#ifdef USE_ZLIB