From db8fdd94ed54f46e3482ea33e8e13bf1b3940350 Mon Sep 17 00:00:00 2001 From: MitchesD Date: Sat, 30 May 2015 19:34:25 +0200 Subject: Merge pull request #14782 from doctaweeks/fixes-for-6.x Minor fixes for 6.x (cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93) Conflicts: src/server/bnetserver/Main.cpp src/server/game/Battlegrounds/Zones/BattlegroundBFG.h src/server/game/Battlegrounds/Zones/BattlegroundTP.h src/server/game/Chat/Channels/Channel.h src/server/game/Entities/Player/Player.h src/server/game/Quests/QuestDef.h src/server/scripts/OutdoorPvP/OutdoorPvPNA.h src/server/shared/Cryptography/SHA256.h --- src/server/game/Chat/Channels/Channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Chat') diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 9b9c2f1e514..0f2a940e3b4 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -184,7 +184,7 @@ class Channel void DeVoice(ObjectGuid guid1, ObjectGuid guid2); void JoinNotify(ObjectGuid guid); // invisible notify void LeaveNotify(ObjectGuid guid); // invisible notify - void SetOwnership(bool ownership) { _ownership = ownership; }; + void SetOwnership(bool ownership) { _ownership = ownership; } static void CleanOldChannelsInDB(); private: -- cgit v1.2.3