Merge branch 'master' of https://vcs.maemo.org/git/situare into userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 17 May 2010 05:37:27 +0000 (08:37 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 17 May 2010 05:37:27 +0000 (08:37 +0300)
commitef6bf3f2bf448161949e1e63ce44566830187f4e
tree2d2bedfb133ed58de2e067b0d3cbce52cac140f0
parenta3b967f7bfbd35c2df284d7a85d660649bd7d692
parentd2956ca42d4cea9264206f73270e2a1403466ff9
Merge branch 'master' of https://vcs.maemo.org/git/situare into userinfo
src/ui/mainwindow.cpp