Merge branch '0.5' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 2 insertions, 0 deletions

diff --git a/src/client.h b/src/client.h
index 836ac3f8..aa650abe 100644
--- a/src/client.h
+++ b/src/client.h
@@ -183,6 +183,7 @@ public:
     void action(const gcn::ActionEvent &event);
 
 private:
+    void initRootDir();
     void initHomeDir();
     void initConfiguration();
     void initUpdatesDir();
@@ -200,6 +201,7 @@ private:
     std::string mUpdateHost;
     std::string mUpdatesDir;
     std::string mScreenshotDir;
+    std::string mRootDir;
 
     ServerInfo mCurrentServer;