[empathy: 4/4] Merge branch: 'Add top-up link to chat text when there is insufficient credit'
- From: Danielle Madeley <daniellem src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 4/4] Merge branch: 'Add top-up link to chat text when there is insufficient credit'
- Date: Fri, 14 Oct 2011 04:25:51 +0000 (UTC)
commit 1180b055b932a8f1a1a6b207093e81b412e62da2
Merge: 8b6c644 601297c
Author: Danielle Madeley <danielle madeley collabora co uk>
Date: Fri Oct 14 15:21:17 2011 +1100
Merge branch: 'Add top-up link to chat text when there is insufficient credit'
libempathy-gtk/empathy-chat-view.c | 16 +++++++++++
libempathy-gtk/empathy-chat-view.h | 6 ++++
libempathy-gtk/empathy-chat.c | 50 +++++++++++++++++++++++++++++++--
libempathy-gtk/empathy-theme-adium.c | 9 ++++++
4 files changed, 78 insertions(+), 3 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]