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

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

commit d121d6a9b9d4d3a654dfd2b0e900be216f161dba
Merge: 9129f3e 8c83da9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Sep 9 16:24:21 2013 +0200

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

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

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