[empathy: 3/3] Merge branch 'preferences-dialog-622557'

From: Danielle Madeley <daniellem src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 3/3] Merge branch 'preferences-dialog-622557'
Date: Thu, 24 Jun 2010 09:38:49 +0000 (UTC)

commit 45ca662701afa1fd92d26c587e56b6e1ade16e83
Merge: 249af05 ee36de0
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu Jun 24 19:38:15 2010 +1000

    Merge branch 'preferences-dialog-622557'

 src/empathy-event-manager.c |   29 ++-
 src/empathy-main-window.c   |  477 +++++++++++++++++++++++++------------------
 src/empathy-main-window.h   |   26 +++-
 src/empathy-main-window.ui  |    8 -
 src/empathy-preferences.c   |  325 ++++++++++++++++-------------
 src/empathy-preferences.h   |   25 +++-
 src/empathy-preferences.ui  |   49 -----
 src/empathy.c               |    3 +-
 8 files changed, 522 insertions(+), 420 deletions(-)
---

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