Merge branch 'userinfo' of https://vcs.maemo.org/git/situare into userinfo
authorlampehe-local <henri.lampela@ixonos.com>
Tue, 18 May 2010 05:17:59 +0000 (08:17 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Tue, 18 May 2010 05:17:59 +0000 (08:17 +0300)
commit69d82c5106bdc6c4a8861c7966de75c430d9f455
tree3623c37611ccbb5bf4b25529ac7048d94fd7cbd7
parent87318a3803940618990852119385455543ad1dc1
parent4312f1ac11252d21d2c3434ea52df974432aabcc
Merge branch 'userinfo' of https://vcs.maemo.org/git/situare into userinfo

Conflicts:
src/src.pro
src/ui/mainwindow.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h