[empathy: 2/2] Merge branch 'sms-651242'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 2/2] Merge branch 'sms-651242'
Date: Wed, 8 Jun 2011 09:44:18 +0000 (UTC)

commit f63939a4648a0ebd64a2ff1468a72036adadb581
Merge: a5656bd eaf1ecc
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Jun 8 11:43:59 2011 +0200

    Merge branch 'sms-651242'

 libempathy-gtk/empathy-chat.c |    5 ++-
 libempathy/empathy-tp-chat.c  |   76 -----------------------------------------
 libempathy/empathy-tp-chat.h  |    2 -
 src/empathy-chat-manager.c    |    2 +-
 4 files changed, 4 insertions(+), 81 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]