[empathy: 22/22] Merge branch 'ack'

From: Jonny Lamb <jonnylamb src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 22/22] Merge branch 'ack'
Date: Tue, 17 May 2011 08:38:30 +0000 (UTC)

commit 2950825a4452bc984c0dd356c5bf17c3a674c451
Merge: 38e5925 9e19149
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Tue May 17 09:36:33 2011 +0100

    Merge branch 'ack'

 libempathy-gtk/empathy-chat-view.c   |   11 +++
 libempathy-gtk/empathy-chat-view.h   |    4 +
 libempathy-gtk/empathy-chat.c        |   43 ++++++++-
 libempathy-gtk/empathy-theme-adium.c |  163 ++++++++++++++++++++++++++++------
 libempathy/empathy-message.c         |   55 +++++++-----
 libempathy/empathy-message.h         |    4 +-
 libempathy/empathy-tp-chat.c         |  113 +++++++++++++-----------
 src/empathy-chat-window.c            |    9 ++
 8 files changed, 296 insertions(+), 106 deletions(-)
---

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