]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'shaunm/dndfiles2'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 30 Nov 2009 15:08:24 +0000 (15:08 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 30 Nov 2009 15:08:24 +0000 (15:08 +0000)
1  2 
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-ui-utils.c
libempathy-gtk/empathy-ui-utils.h
src/empathy-chat-window.c

Simple merge
Simple merge
Simple merge
Simple merge