projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26c03aa 2e76f2e)
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 14:13:17 +0000 (17:13 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 14:13:17 +0000 (17:13 +0300)
Conflicts:
images.qrc

1  2 
src/ui/mainwindow.cpp patch | diff1 | diff2 | blob | history
src/ui/mainwindow.h patch | diff1 | diff2 | blob | history

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