projects
/
empathy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e7f7047
fff7680
)
Merge branch 'people-nearby-fake-group-613558'
author
Danielle Madeley
<danielle.madeley@collabora.co.uk>
Tue, 30 Mar 2010 10:37:25 +0000
(21:37 +1100)
committer
Danielle Madeley
<danielle.madeley@collabora.co.uk>
Tue, 30 Mar 2010 10:37:25 +0000
(21:37 +1100)
1
2
libempathy-gtk/empathy-contact-list-store.c
patch
|
diff1
|
diff2
|
blob
|
history
libempathy-gtk/empathy-contact-list-store.h
patch
|
diff1
|
diff2
|
blob
|
history
libempathy-gtk/empathy-contact-list-view.c
patch
|
diff1
|
diff2
|
blob
|
history
libempathy/empathy-tp-contact-list.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libempathy-gtk/empathy-contact-list-store.c
Simple merge
diff --cc
libempathy-gtk/empathy-contact-list-store.h
Simple merge
diff --cc
libempathy-gtk/empathy-contact-list-view.c
Simple merge
diff --cc
libempathy/empathy-tp-contact-list.c
Simple merge