Intel 4825832c85 Merge branch '6.x' into Spells ...

Conflicts:
	src/server/game/DataStores/DBCStores.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/scripts/Spells/spell_druid.cpp

2014-12-07 23:20:52 +02:00

..

auth

DB/BattleNet: Update wow build to 19243

2014-12-05 22:52:38 +01:00

characters

Core/Talents:

2014-11-12 21:43:48 +02:00

hotfixes

DB/Hotfixes: Fixed some texts in broadcast_text that had double quotation marks

2014-10-24 15:11:40 -04:00

world

Renamed wrong named sql file from merge

2014-12-05 14:55:51 +01:00