projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcb1c1b 9d4a483)
Merge branch 'master' into charcounter
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 09:46:04 +0000 (12:46 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 09:46:04 +0000 (12:46 +0300)
Conflicts:
src/ui/updatelocation/updatelocationdialog.cpp
src/ui/updatelocation/updatelocationdialog.h
src/ui/userinfo.cpp

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.