Nay 4e46f7ced6 Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist

2012-08-18 17:13:46 +01:00

..

base

Update sql/base/auth_database.sql

2012-08-12 04:20:58 +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

SQL: Move all world sql updates to /old/ directory. Base DB is available in https://github.com/TrinityCore/TrinityCore_4.3.4_DB_Alpha

2012-08-16 00:07:29 +01:00

updates

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

2012-08-18 17:13:46 +01:00