[empathy: 3/3] Merge branch 'ack-all'



commit 57f093617f28dea1a4d4ab948561579d3f623427
Merge: 4219fa9 c4bd37a
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Feb 16 12:06:44 2010 +0000

    Merge branch 'ack-all'

 libempathy-gtk/empathy-chat.c |   21 +++++++--------------
 libempathy/empathy-tp-chat.c  |    7 +++++++
 libempathy/empathy-tp-chat.h  |    1 +
 3 files changed, 15 insertions(+), 14 deletions(-)
---



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