projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ccff5a 7377547)
Merge commit 'origin/locationlistview' into friendlist_filtering_text_field
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 12 Aug 2010 10:26:43 +0000 (13:26 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 12 Aug 2010 10:26:43 +0000 (13:26 +0300)
Conflicts:
tests/tests.pro


Trivial merge
Unnamed repository; edit this file to name it for gitweb.