diff options
| author | Spp <spp@jorge.gr> | 2012-12-17 12:13:51 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-12-17 12:13:51 +0100 |
| commit | a227a3494766103cf6805cf52839612854c2767b (patch) | |
| tree | 80519e3484d4b7deaf36d944caf2bb1a3a254e88 /src/tools | |
| parent | 70b542a88cef4f33a793d87665a1e0ebd179c5ab (diff) | |
| parent | 5a52acbe40c2a455419b43bbfdda82709a1cbe80 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/CoreAI/PetAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 050ec790dbb..3c7b433e125 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -586,7 +586,7 @@ int main(int argc, char ** argv) //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx // Create the working directory if (mkdir(szWorkDirWmo -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) , 0711 #endif )) |