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

Conflicts:
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Spells/Spell.cpp

2013-02-27 21:12:00 +01:00

..

Accounts

Core/RBAC: Add .reload rbac command and prevent possible crash if rbac_permissions has wrong data

2013-02-27 03:30:53 +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-26 16:11:15 +01:00

AuctionHouse

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

2013-02-25 17:11:36 +01:00

Battlefield

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

2013-02-09 20:33:30 +00: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' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-23 23:53:23 +01:00

Chat

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

2013-02-25 23:10:45 +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' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-25 17:11:36 +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-25 17:11:36 +01:00

Entities

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

2013-02-27 21:12:00 +01:00

Events

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

2013-02-21 00:45:02 +01:00

Globals

Core/Loading: Fix LoadCreatureTemplates

2013-02-27 08:05:51 +00: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-18 18:51:52 +01:00

Guilds

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

2013-02-25 17:11:36 +01:00

Handlers

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

2013-02-27 21:12:00 +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-13 21:48:09 +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-26 16:11:15 +01:00

Miscellaneous

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

2013-02-25 17:11:36 +01:00

Movement

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

2013-02-13 21:48:09 +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-02-27 04:08:19 +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-15 14:23:21 +01:00

Server

Merge branch 'master' into 4.3.4

2013-02-27 04:08:19 +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-27 21:12:00 +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' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-18 18:51:52 +01:00

World

Merge branch 'master' into 4.3.4

2013-02-27 04:08:19 +01:00

CMakeLists.txt

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

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