diff options
| author | Littleboy | 2011-05-02 17:18:22 -0400 |
|---|---|---|
| committer | Littleboy | 2011-05-02 17:21:10 -0400 |
| commit | 0e45aa8655dc3122e8d88dbcb67ab2013a292989 (patch) | |
| tree | f523e5c1870497528d85385ce5ef24259937813c /gui/ThemeLayout.cpp | |
| parent | 580986aa42889c9a775b3ebe5709292d779f41cf (diff) | |
| parent | 1aff380a15f12e53bd380fc2a189882e2d6172c0 (diff) | |
| download | scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.gz scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.bz2 scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.zip | |
Merge remote-tracking branch 'upstream/master' into nsis
Conflicts:
devtools/create_project/scripts/postbuild.cmd
devtools/create_project/visualstudio.cpp
ports.mk
Diffstat (limited to 'gui/ThemeLayout.cpp')
| -rw-r--r-- | gui/ThemeLayout.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gui/ThemeLayout.cpp b/gui/ThemeLayout.cpp index 3c930db73c..fbfc498bcb 100644 --- a/gui/ThemeLayout.cpp +++ b/gui/ThemeLayout.cpp @@ -25,14 +25,12 @@ #include "common/util.h" #include "common/system.h" -#include "common/events.h" -#include "common/xmlparser.h" -#include "gui/ThemeEval.h" #include "gui/ThemeLayout.h" -#ifdef LAYOUT_DEBUG_DIALOG #include "graphics/font.h" + +#ifdef LAYOUT_DEBUG_DIALOG #include "graphics/surface.h" #endif |