Merged patch.
-rw-r--r-- 26 .gitignore
drwxr-xr-x - 3rdparty
drwxr-xr-x - Client
drwxr-xr-x - Core
drwxr-xr-x - Documents
-rw-r--r-- 76423 Doxyfile
drwxr-xr-x - GLUtil
drwxr-xr-x - ModelTool
drwxr-xr-x - OgreClient
drwxr-xr-x - Protocol
-rw-r--r-- 1617 README
drwxr-xr-x - Server
drwxr-xr-x - SfmlClient
drwxr-xr-x - Util
drwxr-xr-x - caves
-rw-r--r-- 187 client.ini
-rwxr-xr-x 98 client.sh
-rwxr-xr-x 146 cppcheck.sh
drwxr-xr-x - fonts
drwxr-xr-x - images
drwxr-xr-x - lua
drwxr-xr-x - mingw
drwxr-xr-x - models
-rw-r--r-- 275 modeltool.ini
-rwxr-xr-x 101 modeltool.sh
-rwxr-xr-x 102 ogre-assimp.sh
-rw-r--r-- 1627 ogre-client.ini
-rwxr-xr-x 102 ogre-client.sh
drwxr-xr-x - ogredata
-rwxr-xr-x 101 png2shape.sh
drwxr-xr-x - png2shape
-rw-r--r-- 9284 premake4.lua
drwxr-xr-x - protobuf
-rwxr-xr-x 93 server.sh
-rw-r--r-- 1401 sfml-client.ini
-rwxr-xr-x 102 sfml-client.sh
drwxr-xr-x - shaders
drwxr-xr-x - spark
-rwxr-xr-x 109 tests.sh
drwxr-xr-x - wavs
drwxr-xr-x - xml