Merge branch 'master' into 303
commita1c4d537f29e8ff14c2eb8be19d48301f68985e2
authortomrus88 <tomrus88@gmail.com>
Fri, 31 Oct 2008 16:03:31 +0000 (31 19:03 +0300)
committertomrus88 <tomrus88@gmail.com>
Fri, 31 Oct 2008 16:03:31 +0000 (31 19:03 +0300)
treee95f78e6fabc4b5623d1bb198b8cecfdbc0e8b9d
parent6f607b43b496d8a8f2f10454b82af0f428f0ea3b
parent569b00ed88db48254e5aa18487845e1948400bea
Merge branch 'master' into 303
src/game/Level2.cpp
src/game/Level3.cpp
src/game/ObjectMgr.cpp
win/VC71/game.vcproj
win/VC80/game.vcproj