]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: c4a27ed)
Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 3 May 2013 12:19:23 +0000 (14:19 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 3 May 2013 12:19:23 +0000 (14:19 +0200)
Conflicts:
src/empathy.c


No differences found
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)