Merge branch 'settings_auto_update'
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 14 Jun 2010 07:25:44 +0000 (10:25 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 14 Jun 2010 07:25:44 +0000 (10:25 +0300)
commit09e2a68bd94233f5ad26c88ab4b41134922536b4
treeabf3ac5f2d06933d51ccda158da57a897432eb50
parent65326496ee74222a6d72a796449d44cc8933a077
parent85dab5707c2f9a0ac43e3baff78d1b51cdc3d2ee
Merge branch 'settings_auto_update'
src/ui/mainwindow.cpp