[empathy: 8/8] Merge remote-tracking branch 'pochu/call-reuse-windows-580794'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 8/8] Merge remote-tracking branch 'pochu/call-reuse-windows-580794'
Date: Thu, 15 Sep 2011 09:54:39 +0000 (UTC)

commit 87f3753ef09050949f28ecdc8272579cb9225641
Merge: 4c7ee0a 42ea425
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Sep 15 11:53:46 2011 +0200

    Merge remote-tracking branch 'pochu/call-reuse-windows-580794'

 src/empathy-call-factory.c |  202 +++++++++++++++++++++++++++++---------------
 src/empathy-call-factory.h |    5 +-
 src/empathy-call-window.c  |  176 +++++++++++++++++++++++++++++++++-----
 src/empathy-call-window.h  |    6 ++
 src/empathy-call.c         |   81 ++++++++++++++++--
 5 files changed, 370 insertions(+), 100 deletions(-)
---

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