]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17d3840 7504002)
Merge branch 'trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Aug 2010 09:57:14 +0000 (11:57 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Aug 2010 09:57:14 +0000 (11:57 +0200)
1  2 
src/empathy-main-window.c patch | diff1 | diff2 | blob | history

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