Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 19 Aug 2010 09:25:26 +0000 (12:25 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 19 Aug 2010 09:25:26 +0000 (12:25 +0300)
1  2 
src/ui/mainwindow.cpp

Simple merge