projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36a3c5c 423891c)
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)
1  2 
src/ui/mainwindow.cpp patch | diff1 | diff2 | blob | history

diff --cc src/ui/mainwindow.cpp
Simple merge
Unnamed repository; edit this file to name it for gitweb.