Shocker ed55fc3567 Merge branch 'master' into 4.x ...

Conflicts:
	src/server/game/Spells/Auras/SpellAuraEffects.h

2011-11-26 23:50:15 +02:00

..

Commands

Merge branch 'master' into 4.x

2011-11-26 03:19:37 +00:00

Custom

Core/Buildsystem: Update copyright-headers for 2011, and adjust with the correct teamname as well.

2011-04-27 18:17:00 +02:00

EasternKingdoms

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

2011-11-23 20:23:26 +01:00

Examples

Cosmetic: Multiple cosmetic changes

2011-09-29 12:43:05 +02:00

Kalimdor

Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit

2011-11-23 19:17:33 +01:00

Northrend

Merge branch 'master' into 4.x

2011-11-26 23:50:15 +02:00

OutdoorPvP

Core/Calendar: Send map raid reset only once

2011-10-18 14:23:08 +02:00

Outland

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

2011-11-23 20:23:26 +01:00

PrecompiledHeaders

This reverts commit f580cddc09.

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

Spells

DB/SAI: Fix some Hallow's End quests

2011-10-23 04:29:44 +01:00

World

Core|DB/Quests: Rename and re-order fields in quest_template table, for the sake of consistency

2011-11-26 03:00:06 +00:00

CMakeLists.txt

This reverts commit f580cddc09.

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