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

Conflicts:
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Spells/spell_generic.cpp

2013-02-04 22:14:56 +01:00

..

Accounts

Fix compile without PCH

2013-02-04 10:10:15 +01:00

Achievements

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

2013-02-02 00:16:11 +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' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-04 22:14:56 +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 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

Battlegrounds

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

Calendar

Merge branch 'master' into 4.3.4

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

Chat

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

2013-02-04 22:14:56 +01:00

Combat

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-01-28 01:04:37 +00:00

Conditions

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

DataStores

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-01-28 01:04:37 +00:00

DungeonFinding

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

2013-02-04 22:14:56 +01:00

Entities

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

2013-02-04 22:14:56 +01:00

Events

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

Globals

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

2013-02-04 22:14:56 +01:00

Grids

Merge branch 'master' into 4.3.4

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

Groups

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

2013-02-04 22:14:56 +01:00

Guilds

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

2013-02-02 00:16:11 +01:00

Handlers

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

2013-02-04 22:14:56 +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-02-03 23:11:48 +01:00

Mails

Merge branch 'master' into 4.3.4

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

Maps

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

2013-02-04 22:14:56 +01:00

Miscellaneous

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

2013-02-04 22:14:56 +01:00

Movement

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

2013-02-04 22:14:56 +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

Removing SQLStorage class leftovers

2011-04-28 23:03:02 +02:00

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' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-04 22:14:56 +01:00

Server

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

2013-02-04 22:14:56 +01:00

Skills

Core/Misc: Some changes to minimize differences with 4.3.4 branch

2013-01-30 10:34:18 +01:00

Spells

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

2013-02-03 23:11:48 +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 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

Tools

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

Warden

Core/Misc: Some changes to minimize differences with 4.3.4 branch

2013-01-30 10:34:18 +01:00

Weather

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

World

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

2013-02-04 22:14:56 +01:00

CMakeLists.txt

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-01-28 01:04:37 +00:00