Merge remote branch '1.0/1.0'

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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/map.h b/src/map.h
index 19d42b02..86a5d3ee 100644
--- a/src/map.h
+++ b/src/map.h
@@ -266,7 +266,7 @@ class Map : public Properties
         /**
          * Gives the map id based on filepath (ex: 009-1)
          */
-        const std::string *getFilename() const;
+        const std::string getFilename() const;
 
         /**
          * Check the current position against surrounding blocking tiles, and