araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-15 20:52:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source 
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
This commit is contained in:
Nay
2012-09-03 16:11:46 +01:00
parent dba602ea16 0db5573d4d
commit 874ddcb0ae
72 changed files with 6074 additions and 2968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/map_extractor/System.cpp
View File

@@ -9,6 +9,7 @@
#include "direct.h"
#else
#include <sys/stat.h>
#include <unistd.h>
#define ERROR_PATH_NOT_FOUND ERROR_FILE_NOT_FOUND
#endif