Merge remote branch '1.0/1.0'

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

1 files changed, 11 insertions, 0 deletions

diff --git a/src/net/manaserv/stats.cpp b/src/net/manaserv/stats.cpp
index b79b1fd9..f109a232 100644
--- a/src/net/manaserv/stats.cpp
+++ b/src/net/manaserv/stats.cpp
@@ -198,5 +198,16 @@ namespace Stats {
                                        it->second.modifiable,
                                        it->second.description);
     }
+
+    std::vector<std::string> getLabelVector()
+    {
+        std::vector<std::string> attributes;
+        StatMap::const_iterator it, it_end;
+        for (it = stats.begin(), it_end = stats.end(); it != it_end; it++)
+            if (it->second.modifiable)
+                attributes.push_back(it->second.name + ":");
+
+        return attributes;
+    }
 } // namespace Stats
 } // namespace ManaServ