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

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 6/6] Merge branch 'gnome-3-10'
Date: Mon, 14 Oct 2013 17:13:20 +0000 (UTC)

commit 10268f4c962a5c307dd012089d03ac1e5c07c9ca
Merge: dcc9d91 bcd1f9a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Oct 14 13:13:03 2013 -0400

    Merge branch 'gnome-3-10'
    
    Conflicts:
        po/pt.po
        src/empathy-audio-sink.c

 NEWS                                     |   22 ++++++++++++++++++++++
 configure.ac                             |    2 +-
 libempathy-gtk/empathy-individual-menu.c |    7 +++++--
 3 files changed, 28 insertions(+), 3 deletions(-)
---

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