]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f11ad07 be2a0aa)
Merge branch 'gnome-3-4'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 3 Apr 2012 07:04:53 +0000 (17:04 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 3 Apr 2012 07:04:53 +0000 (17:04 +1000)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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