[empathy: 3/3] Merge branch 'dialpad-widget'

From: Danielle Madeley <daniellem src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 3/3] Merge branch 'dialpad-widget'
Date: Wed, 19 Oct 2011 22:19:59 +0000 (UTC)

commit 969f127739465b0fc6477fa4b376b76a8d377974
Merge: 8e1dfe2 6a57263
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu Oct 20 09:19:13 2011 +1100

    Merge branch 'dialpad-widget'

 libempathy-gtk/Makefile.am              |    2 +
 libempathy-gtk/empathy-dialpad-widget.c |  188 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-dialpad-widget.h |   57 +++++++++
 libempathy-gtk/empathy-ui-utils.c       |  102 -----------------
 libempathy-gtk/empathy-ui-utils.h       |    5 -
 src/empathy-call-window.c               |   23 +---
 src/empathy-streamed-media-window.c     |   23 ++--
 7 files changed, 265 insertions(+), 135 deletions(-)
---

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