Merge commit 'origin/master' into 320

Conflicts:
	src/game/Player.cpp
	src/game/Totem.cpp
This commit is contained in:
tomrus88 2009-07-21 08:22:30 +04:00
commit 4c709772c1
61 changed files with 912 additions and 454 deletions

View file

@ -167,4 +167,4 @@ bool Totem::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) co
break;
}
return Creature::IsImmunedToSpellEffect(spellInfo, index);
}
}