Merge branch 'master' into 303
commitfc3362850d7932e96f1dd6625c07c405dd283028
authortomrus88 <tomrus88@gmail.com>
Fri, 28 Nov 2008 15:15:12 +0000 (28 18:15 +0300)
committertomrus88 <tomrus88@gmail.com>
Fri, 28 Nov 2008 15:15:12 +0000 (28 18:15 +0300)
treef2bea583f619fbde854b81596fef6f7a12bd9ab1
parentbc70267c1bc8e23fc271b6d1998e578d985786ed
parent545d02ee3c22a0dd8178fa13fb4d0271a906e9ee
Merge branch 'master' into 303
src/game/Map.cpp
src/game/Map.h