[empathy: 11/11] Merge branch 'connection-error-523895'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 11/11] Merge branch 'connection-error-523895'
Date: Thu, 5 Aug 2010 12:20:25 +0000 (UTC)

commit fe3dade449f6c4ef735166696fe86de968122b94
Merge: c735abd 717184f
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Aug 5 14:19:18 2010 +0200

    Merge branch 'connection-error-523895'

 libempathy/empathy-utils.c    |   87 ++++++++++++++++++++++++++++++++++++++++-
 libempathy/empathy-utils.h    |    3 +-
 src/empathy-accounts-dialog.c |    4 +-
 src/empathy-main-window.c     |   11 +----
 4 files changed, 93 insertions(+), 12 deletions(-)
---

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