]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6be6c7 aeb15b7)
Merge branch 'move-video-preview-656268'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Mon, 15 Aug 2011 12:32:40 +0000 (13:32 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Mon, 15 Aug 2011 12:32:40 +0000 (13:32 +0100)
1  2 
src/empathy-call-window.c patch | diff1 | diff2 | blob | history

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