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

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
This commit is contained in:
Vincent-Michael committed 2013-09-09 18:26:31 +02:00
commit ce742dc7a0
22 files changed
+179 -60

No files matched your search

+2 -1
View File
@@ -119,6 +119,7 @@ public:
return false;
targetGuild->Disband();
delete targetGuild;
return true;
}
@@ -165,7 +166,7 @@ public:
if (!targetGuild)
return false;
targetGuild->DeleteMember(targetGuid, false, true);
targetGuild->DeleteMember(targetGuid, false, true, true);
return true;
}