]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b55050d 083af6c)
Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 24 Dec 2010 06:04:05 +0000 (17:04 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 24 Dec 2010 06:04:05 +0000 (17:04 +1100)
1  2 
src/empathy-accounts-dialog.c patch | diff1 | diff2 | blob | history

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