Vincent-Michael 13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp

2014-07-14 21:01:55 +02:00

..

base

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

2014-07-09 21:09:47 +02:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

TDB 434.6 - 2014/07/05

2014-07-06 00:24:01 +02:00

updates

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

2014-07-14 21:01:55 +02:00