Vincent-Michael 3166638078 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp

2013-08-28 19:24:01 +02:00

..

Commands

Scripts/Commands: Revert changes to cs_debug; fixes build

2013-08-25 14:38:48 +01:00

Custom

Update copyright note for 2013.

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

EasternKingdoms

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

2013-08-27 16:10:11 +01:00

Events

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

2013-08-18 18:13:14 +02:00

Examples

Scripts/DrakTharonKeep: add some spellscripts, add yells to novos, and do some cosmetic changes

2013-08-07 17:31:36 +02:00

Kalimdor

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

2013-08-28 19:24:01 +02:00

Maelstrom

Scripted: Remove Whitespace/Tabs

2013-08-09 20:37:09 +02:00

Northrend

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

2013-08-28 19:24:01 +02:00

OutdoorPvP

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

2013-07-14 16:10:20 +01:00

Outland

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

2013-08-28 19:24:01 +02:00

Pet

Scripts/Pet: Fix non pch compile

2013-08-10 16:00:58 +01:00

PrecompiledHeaders

…

Spells

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

2013-08-28 19:24:01 +02:00

World

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

2013-08-18 18:13:14 +02:00

CMakeLists.txt

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

2013-08-09 20:02:21 +02:00