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

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp

2013-09-05 16:46:14 +02:00

..

Commands

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

2013-09-05 16:46:14 +02:00

Custom

Update copyright note for 2013.

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

EasternKingdoms

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

2013-09-05 16:46:14 +02: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-30 21:43:02 +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-09-05 16:46:14 +02:00

OutdoorPvP

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

2013-09-05 16:46:14 +02:00

Outland

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

2013-09-05 16:46:14 +02:00

Pet

DB/Creature: Fix cords for quest "Death Comes From On High"

2013-08-31 19:33:14 +02:00

PrecompiledHeaders

This reverts commit f580cddc09.

2011-06-28 13:05:15 +02:00

Spells

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

2013-09-05 16:46:14 +02:00

World

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

2013-08-31 21:52:15 +02:00

CMakeLists.txt

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

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