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

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 4/4] Merge branch 'gnome-3-6'
Date: Tue, 8 Jan 2013 11:38:41 +0000 (UTC)

commit 5dd66017b88e4a0d248ff75e26f12c45a959a7fa
Merge: 7fd0b32 d95a09b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jan 8 12:38:01 2013 +0100

    Merge branch 'gnome-3-6'

 libempathy/empathy-account-settings.c |   12 +++---
 libempathy/empathy-tp-chat.c          |   58 +++++++++++++++++++++++++++------
 src/empathy-roster-window.c           |    1 +
 3 files changed, 55 insertions(+), 16 deletions(-)
---

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