]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcc9d91 bcd1f9a)
Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 14 Oct 2013 17:13:03 +0000 (13:13 -0400)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 14 Oct 2013 17:13:03 +0000 (13:13 -0400)
Conflicts:
po/pt.po
src/empathy-audio-sink.c

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)