[empathy: 3/3] Merge branch 'muc-crash-633329'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 3/3] Merge branch 'muc-crash-633329'
Date: Fri, 29 Oct 2010 07:50:30 +0000 (UTC)

commit 8b529506fbc4265b44ab35cda5bdc99978192680
Merge: 2237080 5c9cc71
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Oct 29 09:50:04 2010 +0200

    Merge branch 'muc-crash-633329'

 libempathy/empathy-chatroom-manager.c |    7 +++++--
 src/empathy-chat-manager.c            |   31 +++++++++++++++++++------------
 2 files changed, 24 insertions(+), 14 deletions(-)
---

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