projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 41c63e3)
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)
 - Reviewed by Jussi Laitinen

Conflicts:
images.qrc
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/locationsearchpanel.cpp


No differences found
Unnamed repository; edit this file to name it for gitweb.