[empathy: 2/2] Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 2/2] Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'
Date: Mon, 10 Jan 2011 10:02:21 +0000 (UTC)

commit 363c9bdf35a11cde6ba7a0da3bc2cb7fcdb7a1b6
Merge: d5f5cfa 98b73f3
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jan 10 11:02:02 2011 +0100

    Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'

 libempathy-gtk/empathy-account-chooser.c |   71 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |    4 ++
 src/empathy-chatrooms-window.c           |    2 +-
 src/empathy-new-chatroom-dialog.c        |   71 +-----------------------------
 4 files changed, 77 insertions(+), 71 deletions(-)
---

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