projects / situare / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d09b5a5 c16c23c)
Merge branch 'master' into context_driven_buttons, review context_driven_buttons
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 3 Sep 2010 10:12:12 +0000 (13:12 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 3 Sep 2010 11:06:29 +0000 (14:06 +0300)
commit41c63e3292ebb059a9dcff52aa8335cdee9f2e78
tree8385492a50957e3bfbe7612439c5af26c4845ee2tree | snapshot
parentd09b5a50cc41230dfdbe596315d5d911576659e6commit | diff
parentc16c23c97901ec289a566ae0c13f5271c573ba40commit | diff
Merge branch 'master' into context_driven_buttons, review

 - Reviewed by Jussi Laitinen

Conflicts:
images.qrc
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/locationsearchpanel.cpp
images.qrc diff1 | diff2 | blob | history
src/src.pro diff1 | diff2 | blob | history
src/ui/friendlistpanel.cpp diff1 | diff2 | blob | history
src/ui/friendlistpanel.h diff1 | diff2 | blob | history
src/ui/locationsearchpanel.cpp diff1 | diff2 | blob | history
src/ui/locationsearchpanel.h diff1 | diff2 | blob | history
src/ui/mainwindow.cpp diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.