[empathy: 16/16] Merge branch 'balance-rebase'

From: Danielle Madeley <daniellem src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 16/16] Merge branch 'balance-rebase'
Date: Thu, 5 May 2011 08:32:04 +0000 (UTC)

commit 822b3b6e0a5d781cbe0ff024eed6c8b8dace6526
Merge: c698741 90d1301
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu May 5 18:30:33 2011 +1000

    Merge branch 'balance-rebase'

 data/org.gnome.Empathy.gschema.xml.in |    5 +
 libempathy/empathy-utils.c            |   75 +++++++
 libempathy/empathy-utils.h            |    2 +
 src/empathy-main-window.c             |  344 +++++++++++++++++++++++++++++++++
 src/empathy-main-window.ui            |   29 +++-
 5 files changed, 452 insertions(+), 3 deletions(-)
---

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