diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-02 20:32:51 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-02 20:32:51 +0100 |
| commit | 15d4c9a2d3cc9888e2ed8333ef28fa4a2567b9fe (patch) | |
| tree | 6ef373bb221ee7c24088bfebbfdcccdb9139df75 | |
| parent | 07c2da75b7d994ab097e7c50d865bee929623685 (diff) | |
| parent | 017e5dd93498dd3dcf168bec95725423564c177c (diff) | |
| download | mana-client-15d4c9a2d3cc9888e2ed8333ef28fa4a2567b9fe.tar.gz mana-client-15d4c9a2d3cc9888e2ed8333ef28fa4a2567b9fe.tar.bz2 mana-client-15d4c9a2d3cc9888e2ed8333ef28fa4a2567b9fe.tar.xz mana-client-15d4c9a2d3cc9888e2ed8333ef28fa4a2567b9fe.zip | |
Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0
| -rw-r--r-- | src/gui/inventorywindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 6a5a8b37..3eae6c60 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -28,12 +28,13 @@ #include "button.h" #include "gui.h" -#include "inventory.h" #include "item_amount.h" #include "itemcontainer.h" #include "scrollarea.h" #include "viewport.h" - +
+
+#include "../inventory.h" #include "../item.h" #include "../localplayer.h" |