Merge branch 'master' of git@github.com:mangos/mangos.git into procflag
commitf0064d28a1f333a464c8f968f8570c966fc17047
authorDiSlord <dislord@nomail.com>
Thu, 11 Dec 2008 22:34:09 +0000 (12 01:34 +0300)
committerDiSlord <dislord@nomail.com>
Thu, 11 Dec 2008 22:34:09 +0000 (12 01:34 +0300)
treeb5b882cb153e54b039c1758c4afd756369ea62ef
parent096789cfe53f4753f1c2837bdeeca3076d78f18a
parentac83b6f9cb79120ab5e08197027d76fc2acdfe2b
Merge branch 'master' of git@github.com:mangos/mangos.git into procflag
src/game/Player.cpp
src/game/Spell.cpp
src/game/SpellAuras.cpp
src/game/SpellEffects.cpp
src/game/SpellMgr.cpp
src/game/Unit.cpp
src/game/Unit.h