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

Browse Source

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_druid.cpp

...

This commit is contained in:

Nay

2012-09-17 23:49:13 +01:00

parent e3add09fb7 2e21fa6b92

commit 6568b0624d

566 changed files with 29934 additions and 14984 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1129

src/server/scripts/Spells/spell_druid.cpp

File diff suppressed because it is too large Load Diff