Merge branch '0.5'

Conflicts:
	CMakeLists.txt
	src/map.cpp
	src/winver.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/map.h b/src/map.h
index 56ddae11..0c342deb 100644
--- a/src/map.h
+++ b/src/map.h
@@ -386,7 +386,7 @@ class Map : public Properties
 
         int mWidth, mHeight;
         int mTileWidth, mTileHeight;
-        int mMaxTileHeight;
+        int mMaxTileHeight, mMaxTileWidth;
         MetaTile *mMetaTiles;
         Layers mLayers;
         Tilesets mTilesets;