Nay 528b9d4f7d Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/shared/Packets/ByteBuffer.h

2012-09-13 17:24:37 +01:00

..

base

Rename SQL and update characters_database.sql

2012-09-10 11:56:37 +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

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

2012-09-03 16:11:46 +01:00

updates

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

2012-09-13 17:24:37 +01:00