Merge branch 'master' into 303
commite2cad145c7337f134fcc3abece9401173adb7530
authortomrus88 <tomrus88@gmail.com>
Sun, 9 Nov 2008 08:37:52 +0000 (9 11:37 +0300)
committertomrus88 <tomrus88@gmail.com>
Sun, 9 Nov 2008 08:37:52 +0000 (9 11:37 +0300)
treeff48801fe255825d63d7e786a4286b1676b66f17
parent6d79638a60d7d2c1ae40f814f1e24fff60e820a2
parente780692541eb29d17bb2215b3f3ea599c5f307c2
Merge branch 'master' into 303
src/game/Level3.cpp
src/game/Spell.cpp
src/game/SpellAuras.cpp