Shauren a50eec9439 Fixed merge errors

2013-05-30 21:23:11 +02:00

..

Commands

Fixed merge errors

2013-05-30 21:23:11 +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-05-30 20:57:07 +02:00

Events

Script/Event: Fix warnings in Children's Week script

2013-04-01 17:52:20 +02:00

Examples

Core/Logging: Performance-related tweaks to logging system

2013-05-13 15:07:36 +02:00

Kalimdor

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

Northrend

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

2013-05-30 20:57:07 +02:00

OutdoorPvP

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

Outland

Scripts/Misc: Fixed many scripts not executing one of their actions because of an event with id = 0

2013-05-19 10:52:39 +02:00

PrecompiledHeaders

…

Spells

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

2013-05-30 20:57:07 +02:00

World

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

CMakeLists.txt

CMake: Include AreaTrigger directory in CMake files

2013-05-26 05:07:49 +03:00