Merge branch 'master' into develop

2015-05-17 12:38:44 +10:00
parent 102ba18b7b 164a3e18d9
commit 822d0636cc
42 changed files with 61 additions and 120 deletions
@@ -25,6 +25,8 @@
 #include "character_manager.hpp"
 #include "server_utilities.hpp"

+#include <cstring>
+
 static int pumpCharacterUpdate(lua_State* L) {
 	CharacterData* characterData = static_cast<CharacterData*>(lua_touserdata(L, 1));