pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 02:31:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server into EQEmu-master

Browse Source 
Conflicts:
	zone/client.h
	zone/mod_functions.cpp
	zone/mod_functions_base.cpp
This commit is contained in:
root
2013-06-01 19:17:23 -05:00
parent ac5926bdfe 39426789f4
commit 7fca5a7a89
231 changed files with 2955 additions and 3061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/console.cpp
+1 -4
View File
@@ -17,7 +17,6 @@
*/
#include "../common/debug.h"
#include <iostream>
using namespace std;
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
@@ -39,6 +38,7 @@ using namespace std;
#include "../common/opcodemgr.h"
#include "../common/rulesys.h"
#include "../common/ruletypes.h"
#include "../common/StringUtil.h"
#include "WorldConfig.h"
#include "zoneserver.h"
#include "zonelist.h"
@@ -49,9 +49,6 @@ using namespace std;
#ifdef _WINDOWS
#define snprintf _snprintf
#if (_MSC_VER < 1500)
#define vsnprintf _vsnprintf
#endif
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#endif