[empathy: 3/5] Merge remote branch 'cosimoc/tls-multireject' into conference

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

commit 589cddd9c1a7a0658e34c4c87a622e6335bb015f
Merge: 51cb135 923c077
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Mon Sep 13 20:38:50 2010 +0100

    Merge remote branch 'cosimoc/tls-multireject' into conference

 extensions/Authentication_TLS_Certificate.xml |  177 ++++++++++++-------------
 libempathy/empathy-tls-certificate.c          |   28 ++++-
 2 files changed, 110 insertions(+), 95 deletions(-)
---

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