summaryrefslogtreecommitdiff
path: root/src/item.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-08-02 23:54:57 -0600
committerJared Adams <jaxad0127@gmail.com>2010-08-03 16:42:17 -0600
commit7773f04b4beb1a24214fe1a367b645a689d2c852 (patch)
tree6711fc8402944eddaf78d46101f0d07687bb7356 /src/item.cpp
parent94f91a5fd9f3f609e93224fe71d2a3bcce1c0866 (diff)
downloadMana-7773f04b4beb1a24214fe1a367b645a689d2c852.tar.gz
Mana-7773f04b4beb1a24214fe1a367b645a689d2c852.tar.bz2
Mana-7773f04b4beb1a24214fe1a367b645a689d2c852.tar.xz
Mana-7773f04b4beb1a24214fe1a367b645a689d2c852.zip
Move Theme and UserPalette to the resources folder
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/item.cpp')
-rw-r--r--src/item.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item.cpp b/src/item.cpp
index 83e12cef..6b13dd1b 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -21,12 +21,12 @@
#include "item.h"
-#include "gui/theme.h"
+#include "configuration.h"
#include "resources/image.h"
#include "resources/iteminfo.h"
#include "resources/resourcemanager.h"
-#include "configuration.h"
+#include "resources/theme.h"
Item::Item(int id, int quantity, bool equipment, bool equipped):
mImage(0),