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

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 8/8] Merge branch 'gnome-3-10'
Date: Sat, 12 Oct 2013 21:51:56 +0000 (UTC)

commit 5719d87e280399be56970a84bfd7419e5baa7e8f
Merge: 5f8e3b0 33ee7a9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Sat Oct 12 17:51:39 2013 -0400

    Merge branch 'gnome-3-10'
    
    Conflicts:
        configure.ac

 src/empathy-debug-window.c |  131 ++++++++++++++++----------------------------
 1 files changed, 48 insertions(+), 83 deletions(-)
---

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