projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a90562 3b8be41)
Merge branch 'master' into charcounter
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 12:52:12 +0000 (15:52 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 13:17:17 +0000 (16:17 +0300)
Reviewed by Marko Niemelä

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.