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

Simple merge