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

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/DataStores/DBCEnums.h
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
This commit is contained in:
Vincent_Michael
2013-12-11 20:34:44 +01:00
parent 70445f34a6 fb26e18523
commit 07024d3ea8
31 changed files with 3139 additions and 1933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_debug.cpp
+1 -1
View File
@@ -924,7 +924,7 @@ public:
if (!ve)
return false;
Creature* v = new Creature;
Creature* v = new Creature();
Map* map = handler->GetSession()->GetPlayer()->GetMap();