Merge remote branch '1.0/1.0'

Conflicts:
	data/graphics/CMakeLists.txt
	data/graphics/Makefile.am
	src/client.cpp

1 files changed, 7 insertions, 0 deletions

diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index ad9c0ed7..c8ebdc98 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -51,6 +51,8 @@ class AttrDisplay : public Container
             DERIVED, CHANGEABLE, UNKNOWN
         };
 
+        ~AttrDisplay();
+
         virtual std::string update();
         virtual Type getType() { return UNKNOWN; }
 
@@ -404,6 +406,11 @@ AttrDisplay::AttrDisplay(int id, const std::string &name):
     mLayout = new LayoutHelper(this);
 }
 
+AttrDisplay::~AttrDisplay()
+{
+    delete mLayout;
+}
+
 std::string AttrDisplay::update()
 {
     int base = player_node->getAttributeBase(mId);