Merge branch 'master' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 21 May 2010 11:46:53 +0000 (14:46 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 21 May 2010 11:46:53 +0000 (14:46 +0300)
commitdeccc932b39c1fa18ba4a9ab99a3082d549ccb0b
treeeed2ca558ff4b5a6d71ccd312d64335fdb8db53e
parent0c5b7f1253f25e64281cfab92063ea8c4f9735b4
parentbe9403a9a43d8a3e97d7706221bdf5afe8f97169
Merge branch 'master' into friendlist
src/map/mapengine.cpp
src/map/mapengine.h