Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
commit0f304e63fbd25aa595db0f1a2b5253045c49e0b2
tree3c05f3909b761e30d190d0eb08460cec99132d45
parentd334b7e04e903aded2a8d6639a0128d789010c81
parent41c63e3292ebb059a9dcff52aa8335cdee9f2e78
Merge branch 'master' of https://vcs.maemo.org/git/situare
src/ui/mainwindow.cpp
src/ui/userinfopanel.cpp