Merge branch 'master' into 4.x and some warning fixes

This commit is contained in:
Spp committed 2011-12-27 10:15:27 +01:00
commit fa9daaf95b
148 files changed
+2881 -969

No files matched your search

@@ -25,7 +25,7 @@
#include "World.h"
#include "zlib.h"
UpdateData::UpdateData(uint16 map) : m_blockCount(0), m_map(map)
UpdateData::UpdateData(uint16 map) : m_map(map), m_blockCount(0)
{
}