Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 10 Jun 2010 06:41:36 +0000 (09:41 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 10 Jun 2010 06:41:36 +0000 (09:41 +0300)
1  2 
src/ui/mainwindow.cpp

Simple merge