]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54917ba e23e2b8)
Merge remote-tracking branch 'origin/gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 17 Jun 2013 09:58:28 +0000 (11:58 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 17 Jun 2013 09:58:28 +0000 (11:58 +0200)
1  2 
src/empathy-debug-window.c patch | diff1 | diff2 | blob | history

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