]> git.0d.be Git - empathy.git/commit
Merge branch 'ack'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 17 May 2011 08:36:33 +0000 (09:36 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 17 May 2011 08:36:33 +0000 (09:36 +0100)
commit2950825a4452bc984c0dd356c5bf17c3a674c451
treec562a901727f1548105acf75884f350d9dfd7192
parent38e5925b90ca5864907aaef09cbaa4c963b1be98
parent9e1914959b7e26e82ca4042ad5f7f042cb5a34a2
Merge branch 'ack'
libempathy-gtk/empathy-chat.c
libempathy/empathy-tp-chat.c
src/empathy-chat-window.c