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

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.h

2013-03-20 22:07:56 +01:00

..

map_extractor

Core/Misc: Fix compile errors introduced in previous merge

2013-01-28 02:54:27 +00:00

mesh_extractor

Fix mismatching new/delete

2013-03-20 06:47:30 -04:00

mmaps_generator

Core: Warning fixes

2013-02-03 14:11:59 +01:00

vmap4_assembler

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-01-28 01:04:37 +00:00

vmap4_extractor

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-01-28 01:04:37 +00:00

CMakeLists.txt

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

2013-02-18 18:51:52 +01:00