[empathy: 2/2] Merge remote branch 'lfrb/ft-cancel'



commit adacbe4f6ef767063a0727368de48cecef1f8fb6
Merge: 02cc95c 4e2b408
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Aug 11 17:28:01 2010 +0200

    Merge remote branch 'lfrb/ft-cancel'

 libempathy/empathy-tp-file.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---



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