Carbenium 79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 ...

Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp

2015-07-21 20:05:44 +02:00

..

dev

SQL: Update /dev/world_database.sql

2014-10-30 13:46:06 +00:00

auth_database.sql

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

2015-07-21 20:05:44 +02:00

characters_database.sql

fix build

2015-03-10 20:13:35 -04:00