]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce51e07 aade7b7)
Merge remote branch 'glassrose/remove-typing-icon-in-muc-tabs-609420'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 24 Jan 2011 14:35:50 +0000 (15:35 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 24 Jan 2011 14:35:50 +0000 (15:35 +0100)
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)