[empathy: 5/5] Merge remote branch 'smcv/conference'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 5/5] Merge remote branch 'smcv/conference'
Date: Tue, 14 Sep 2010 08:21:38 +0000 (UTC)

commit a7a632c6fc92759d927b18a020c76e5c9b848d69
Merge: 826cb45 c7fab42
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Sep 14 10:21:03 2010 +0200

    Merge remote branch 'smcv/conference'

 extensions/Authentication_TLS_Certificate.xml     |   20 +-
 extensions/Channel_Interface_Conference.xml       |  539 +++++++++++++++------
 extensions/Channel_Type_Server_TLS_Connection.xml |    8 +-
 3 files changed, 405 insertions(+), 162 deletions(-)
---

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