Merge branch 'master' into 310

Browse source

Conflicts:
	src/game/GameObject.h
	src/game/MiscHandler.cpp
	src/game/Player.cpp
	src/game/QueryHandler.cpp
	src/game/QuestHandler.cpp
	src/game/SkillHandler.cpp
	src/game/SpellAuras.cpp
	src/game/SpellEffects.cpp
	src/game/Unit.cpp
	src/game/WorldSession.h

...

This commit is contained in:

tomrus88 2009-05-29 19:15:43 +04:00

parent 84ed071e16 42f8ce5f3e

commit e454cb693d

8 changed files with 244 additions and 234 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

450

src/game/Spell.cpp

View file

File diff suppressed because it is too large Load diff