[empathy/gnome-2-34: 4/4] Merge branch 'stable-block-645504-2.34' into gnome-2-34

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy/gnome-2-34: 4/4] Merge branch 'stable-block-645504-2.34' into gnome-2-34
Date: Tue, 22 Mar 2011 13:55:43 +0000 (UTC)

commit 19d3ea612850bc3e2fabc387997e97ea11c89645
Merge: c54f625 965d241
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Mar 22 14:55:16 2011 +0100

    Merge branch 'stable-block-645504-2.34' into gnome-2-34

 configure.ac                                       |    2 +-
 .../Connection_Interface_Contact_Blocking.xml      |  172 --------------------
 extensions/Makefile.am                             |    1 -
 extensions/misc.xml                                |    1 -
 libempathy/empathy-tp-contact-list.c               |   12 +-
 5 files changed, 7 insertions(+), 181 deletions(-)
---

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