[empathy: 7/7] Merge branch 'delivery-reports-rebase'

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

commit c698741b1825e306de447fa09624f4a93f067374
Merge: 981d175 0d44943
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu May 5 18:22:31 2011 +1000

    Merge branch 'delivery-reports-rebase'

 libempathy-gtk/empathy-chat.c |   96 ++++++++++++++++++++++++++++++++---------
 libempathy-gtk/empathy-chat.h |    2 +
 libempathy/empathy-tp-chat.c  |   94 +++++++++++++++++++++++++++++++++++++---
 libempathy/empathy-tp-chat.h  |    6 +++
 src/empathy-chat-window.c     |   38 ++++++++++++++++
 5 files changed, 208 insertions(+), 28 deletions(-)
---

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