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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/SpellMgr.cpp

2013-02-02 00:16:11 +01:00

..

base

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

2013-01-31 00:10:17 +01: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.03

2013-01-23 05:10:56 +00:00

updates

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

2013-02-02 00:16:11 +01:00