Merge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 30 Jul 2010 07:32:40 +0000 (10:32 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 30 Jul 2010 07:32:40 +0000 (10:32 +0300)
commitc04389178a2874b0a8776a42c0ed4764b5424db8
tree06494ecf5b19f24f16870f216aec41ca552ceb18
parent229191aa56ca5e84eedb53fb27f473a270254ba1
parent15a1c52ca0f7161788423ec804940e71d469d23f
Merge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator

Conflicts:
src/ui/indicatorbutton.cpp
src/ui/indicatorbutton.h
src/map/mapengine.cpp
src/ui/indicatorbutton.cpp
src/ui/indicatorbutton.h