diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /src/gui/shop.h | |
parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
download | mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'src/gui/shop.h')
-rw-r--r-- | src/gui/shop.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/shop.h b/src/gui/shop.h index 4a03b2bc..22b649d0 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -27,10 +27,11 @@ #include <guichan/listmodel.hpp> -#include "../resources/image.h" - +#include "../guichanfwd.h" #include "../shopitem.h" +#include "../resources/image.h" + class ShopItems : public gcn::ListModel { public: |