[empathy: 8/8] Merge branch 'gnome-3-8'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 8/8] Merge branch 'gnome-3-8'
Date: Fri, 24 May 2013 14:02:02 +0000 (UTC)

commit 9d408bd199a0b577eaec9826df060397578f3a37
Merge: 138123c ec619f9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri May 24 16:00:49 2013 +0200

    Merge branch 'gnome-3-8'
    
    Conflicts:
        NEWS
        configure.ac

 libempathy-gtk/empathy-log-window.c |    9 ++-------
 src/empathy-debug-window.c          |    2 +-
 src/empathy-new-chatroom-dialog.c   |   12 ++++++------
 3 files changed, 9 insertions(+), 14 deletions(-)
---

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