MitchesD
db8fdd94ed
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
2015-06-01 00:39:56 +01:00
..
2015-06-01 00:39:56 +01:00
2015-03-30 17:16:50 +02:00
2015-03-18 02:59:40 +01:00
2015-03-18 23:16:39 +00:00
2015-01-01 00:32:50 +01:00