]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e38a9c 225ca2e)
Merge branch 'sasl-gui'
authorJonny Lamb <jonnylamb@gnome.org>
Wed, 15 Dec 2010 08:56:03 +0000 (08:56 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Wed, 15 Dec 2010 08:56:03 +0000 (08:56 +0000)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/empathy-main-window.c patch | diff1 | diff2 | blob | history

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