Merge branch 'master' into userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 14 May 2010 12:42:11 +0000 (15:42 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 14 May 2010 12:42:11 +0000 (15:42 +0300)
commit3c52f797538a08df8a7a8a9d58fd525d3625dac9
treebf240dd2aa207fdec68bc77a764f3f972f5c36f4
parent53b39bff48a7857bccd6229bfc841c00520b35eb
parent66210d9650938f7d6254b4e58b801d3c52e4e53e
Merge branch 'master' into userinfo

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