Spp 8ae0f2332c Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Battlefield/Zones/BattlefieldWG.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/azshara.cpp

2012-11-26 08:43:29 +01:00

..

base

Merge branch 'master' into 4.3.4

2012-11-19 10:09:58 +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 branch 'master' into 4.3.4

2012-11-19 10:09:58 +01:00

updates

Merge branch 'master' into 4.3.4

2012-11-26 08:43:29 +01:00