]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cfd64b 923bb82)
Merge branch 'auto-connect'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Tue, 8 Sep 2009 15:22:00 +0000 (16:22 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Tue, 8 Sep 2009 15:22:00 +0000 (16:22 +0100)
1  2 
src/empathy.c patch | diff1 | diff2 | blob | history

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