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

Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Pet/Pet.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp

2013-03-21 22:00:01 +01:00

..

BlackfathomDeeps

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

CavernsOfTime

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

2013-03-21 22:00:01 +01:00

Firelands

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

2013-02-19 18:57:36 +01:00

HallsOfOrigination

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

2013-02-19 18:57:36 +01:00

Maraudon

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

OnyxiasLair

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

RazorfenDowns

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

RazorfenKraul

Core/Scripts: Removed CAST_PLR define

2013-03-21 13:07:10 +01:00

RuinsOfAhnQiraj

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

TempleOfAhnQiraj

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

WailingCaverns

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

ZulFarrak

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

boss_azuregos.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

CMakeLists.txt

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

2013-02-03 23:11:48 +01:00

zone_ashenvale.cpp

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

zone_azshara.cpp

Core/Scripts: Removed CAST_PLR define

2013-03-21 13:07:10 +01:00

zone_azuremyst_isle.cpp

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

2013-03-07 23:00:41 +01:00

zone_bloodmyst_isle.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_darkshore.cpp

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

zone_desolace.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_durotar.cpp

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

2013-03-21 22:00:01 +01:00

zone_dustwallow_marsh.cpp

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

2013-03-10 01:08:55 +01:00

zone_felwood.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_feralas.cpp

Core/Spell: Gordunni Trap

2013-01-12 15:01:53 +01:00

zone_moonglade.cpp

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

2013-03-07 23:00:41 +01:00

zone_mulgore.cpp

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

2013-02-19 18:57:36 +01:00

zone_orgrimmar.cpp

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

zone_silithus.cpp

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

2013-02-19 18:57:36 +01:00

zone_stonetalon_mountains.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_tanaris.cpp

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

2013-03-21 22:00:01 +01:00

zone_teldrassil.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_the_barrens.cpp

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

2013-03-21 22:00:01 +01:00

zone_thousand_needles.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_thunder_bluff.cpp

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

2013-03-10 01:08:55 +01:00

zone_ungoro_crater.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_winterspring.cpp

Core/Scripts: Removed CAST_CRE define

2013-03-21 13:48:36 +01:00