Merge commit 'origin/master' into 320
commit6319c05087016304d29705f05eed04c643701813
authortomrus88 <tomrus88@gmail.com>
Thu, 16 Jul 2009 09:23:03 +0000 (16 13:23 +0400)
committertomrus88 <tomrus88@gmail.com>
Thu, 16 Jul 2009 09:23:03 +0000 (16 13:23 +0400)
tree397873a885b39a768f1faa68e83f6a043eac21af
parentcfef25f121446e16da7947cd626883c3a17d431b
parent0619d04853d145d735a5f0714cf90f91dd5eeb30
Merge commit 'origin/master' into 320
src/game/MiscHandler.cpp
src/game/SpellEffects.cpp