]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 981d175 0d44943)
Merge branch 'delivery-reports-rebase'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 08:22:31 +0000 (18:22 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 08:22:31 +0000 (18:22 +1000)
1  2 
src/empathy-chat-window.c patch | diff1 | diff2 | blob | history

diff --cc src/empathy-chat-window.c
Simple merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)