Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source

Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp

...

This commit is contained in:

Vincent-Michael

2013-07-17 20:24:29 +02:00

parent b95b19b3cb 4ba3c2e51d

commit 63675c3b0b

7 changed files with 2603 additions and 2551 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

src/server/scripts/Spells/spell_generic.cpp

+2477 -2434

File diff suppressed because it is too large Load Diff