projects / situare / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb1eac9 b208daf)
Merge branch 'situare_interact' of https://vcs.maemo.org/git/situare into situare_int...
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 7 Sep 2010 05:29:17 +0000 (08:29 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 7 Sep 2010 05:29:17 +0000 (08:29 +0300)
commit29a9ab11cb6b97c4a2bba86dcee9925da946eef2
treee18d8d66c7beaa125175ef414eb759d79c07714etree | snapshot
parenteb1eac9eb5093b58ee6a824996db1a8f1d6f5821commit | diff
parentb208daf2de858ecf33de2fa1ecd910b4a152354acommit | diff
Merge branch 'situare_interact' of https://vcs.maemo.org/git/situare into situare_interact

Conflicts:
images.qrc
res/images/chat.png
res/images/chat_btn.png
res/images/chat_btn_d.png
res/images/chat_btn_s.png
res/images/contact_btn.png
res/images/contact_btn_d.png
res/images/contact_btn_s.png
res/images/tag.png
res/images/tag_btn.png
res/images/tag_btn_d.png
res/images/tag_btn_s.png
src/ui/mainwindow.cpp
src/ui/userinfo.cpp
src/ui/userinfo.h
src/ui/userinfo.cpp diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.