Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 14 May 2010 12:24:09 +0000 (15:24 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 14 May 2010 12:24:09 +0000 (15:24 +0300)
commit66210d9650938f7d6254b4e58b801d3c52e4e53e
treeb80d45023f973352122cc3d59de2e9a521356c83
parent7f3ca12ab830ca9c87d93466292997314f4824db
parent81a85d8fb56213f9a4a4ecf6de91a279b4935c77
Merge branch 'master' of https://vcs.maemo.org/git/situare

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