Merge branch 'master' into scalable_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 14 Jun 2010 13:18:45 +0000 (16:18 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 14 Jun 2010 13:18:45 +0000 (16:18 +0300)
commitc37beb773855b90c7f270481eda9f4b16744f090
tree82d9a76e0208a1d51844cc0be1d92218630c9c6c
parentca3fc5e3d53e3c3ae3bf48b1b6ea33f565f23105
parent0c5ddc452e306b4fd9c55cb221657cd3bebdaf1f
Merge branch 'master' into scalable_panels

Conflicts:
src/map/baselocationitem.h
src/map/mapengine.h
src/map/baselocationitem.h
src/map/mapengine.h