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)
1  2 
src/ui/mainwindow.cpp

Simple merge