[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 13:23:29 +0000 (UTC)

commit 9129f3e31d22e7b375f3c90fd2e89e05f5e564eb
Merge: d0f21a3 fa72bed
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Sep 9 15:22:44 2013 +0200

    Merge branch 'gnome-3-8'
    
    Conflicts:
        libempathy/empathy-keyring.c

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

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