Spp 0e8011657d Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h

2013-01-16 15:29:41 +01:00

..

Accounts

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

Achievements

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

Addons

Core/Misc: Fix a couple of warnings, some of them performance related

2013-01-04 23:14:14 +00:00

AI

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

AuctionHouse

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Battlefield

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Battlegrounds

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

Calendar

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Chat

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

Combat

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Conditions

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

DataStores

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

DungeonFinding

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Entities

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

Events

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Globals

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

Grids

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Groups

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Guilds

Core: Fixed some compile warnings

2013-01-14 15:05:30 +01:00

Handlers

Core: Fixed some compile warnings

2013-01-14 15:05:30 +01:00

Instances

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Loot

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

2013-01-05 17:01:46 +01:00

Mails

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Maps

Core: Fixed some compile warnings

2013-01-14 15:05:30 +01:00

Miscellaneous

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Movement

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

OutdoorPvP

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Pools

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

PrecompiledHeaders

…

Quests

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Reputation

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Scripting

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Server

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

Skills

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Spells

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

Texts

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Tickets

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Tools

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

Warden

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

Weather

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

World

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00