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