DDuarte b204d71cb4 Core: Fix build due to merge resolution errors

2014-01-11 23:29:27 +00:00

..

Commands

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

Custom

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

EasternKingdoms

Core: Fix build due to merge resolution errors

2014-01-11 23:29:27 +00:00

Events

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

Examples

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

Kalimdor

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

Maelstrom

Scripted: Remove Whitespace/Tabs

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

Northrend

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

OutdoorPvP

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

Outland

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

Pet

Core/Entities: correct creature damage, offhand damage should work too

2014-01-04 18:22:06 +01:00

PrecompiledHeaders

This reverts commit f580cddc09.

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

Spells

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

World

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00