]> git.0d.be Git - empathy.git/commitdiff
Merge remote-tracking branch 'glassrose/moving-part-functionality-to-empathy-chat...
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 13 May 2011 14:27:21 +0000 (16:27 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 13 May 2011 14:27:21 +0000 (16:27 +0200)
1  2 
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-chat.h
libempathy/empathy-tp-chat.c
src/empathy-chat-window.c

Simple merge
Simple merge
Simple merge
Simple merge