]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5195f67 0a42a79)
Merge remote-tracking branch 'glassrose/make-favorite-room-names-more-detailed-646526'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 25 May 2011 08:24:49 +0000 (10:24 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 25 May 2011 08:24:49 +0000 (10:24 +0200)
1  2 
src/empathy-main-window.c patch | diff1 | diff2 | blob | history

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