projects
/
empathy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b6b8da
16e0d5a
)
Merge remote-tracking branch 'pochu/error-dialog'
author
Danielle Madeley
<danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:31:16 +0000
(15:31 +1100)
committer
Danielle Madeley
<danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:32:13 +0000
(15:32 +1100)
1
2
libempathy-gtk/empathy-chat.c
patch
|
diff1
|
diff2
|
blob
|
history
libempathy-gtk/empathy-individual-menu.c
patch
|
diff1
|
diff2
|
blob
|
history
libempathy/empathy-auth-factory.c
patch
|
diff1
|
diff2
|
blob
|
history
src/empathy-chat-manager.c
patch
|
diff1
|
diff2
|
blob
|
history
src/empathy-chat-window.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libempathy-gtk/empathy-chat.c
Simple merge
diff --cc
libempathy-gtk/empathy-individual-menu.c
Simple merge
diff --cc
libempathy/empathy-auth-factory.c
Simple merge
diff --cc
src/empathy-chat-manager.c
Simple merge
diff --cc
src/empathy-chat-window.c
Simple merge