]> git.0d.be Git - empathy.git/commit
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)
commit740a34efd932ad1bf6d5cd1d4580fd3b6af0eacc
tree0e9497b8a933cab09ee209d92097c5f273612ded
parent8d21537a22e1e4a1e6224d5e70190e0be2ef9a40
parent9ec54fdc072173c6676ec2d8ea0b8eabe6936cef
Merge commit 'shaunm/dndfiles2'
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-ui-utils.c
libempathy-gtk/empathy-ui-utils.h
src/empathy-chat-window.c