]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c217f84 047c6ff)
Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 5 Jun 2012 07:31:04 +0000 (09:31 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 5 Jun 2012 07:31:04 +0000 (09:31 +0200)
1  2 
src/empathy-auth-client.c patch | diff1 | diff2 | blob | history

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