Merge branch 'master' into 303
commit20d859b833c3fb3a506b561d0802587f15aeb624
authortomrus88 <tomrus88@gmail.com>
Sat, 15 Nov 2008 19:05:22 +0000 (15 22:05 +0300)
committertomrus88 <tomrus88@gmail.com>
Sat, 15 Nov 2008 19:05:22 +0000 (15 22:05 +0300)
treede558a7c5fd42b18ed022e70655bc5d94a2c5c06
parentfe32a9dbe5d148b2a0ae37e8c5d334a3a67f1e4b
parentb21edf944114d90f992a16f85fab0e197b7894bd
Merge branch 'master' into 303
src/game/Map.cpp
src/game/Map.h
src/game/Unit.cpp
src/game/World.cpp