Merge branch 'master' into settings_auto_update
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 9 Jun 2010 05:06:02 +0000 (08:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 9 Jun 2010 05:06:02 +0000 (08:06 +0300)
commitbc4bf2aeb597f39955ed8cbe3a3fdcd5914d7ec8
tree949fae43e80511771b302a779240221ffde337d6
parent36a3c5c99da3986bc93860bf453f9771ee8930ce
parent423891cc453c0034c5c145959c57c751878e3b05
Merge branch 'master' into settings_auto_update
src/ui/mainwindow.cpp