[empathy: 2/2] Merge branch 'trivia'



commit 335d9576a93088c11a44de1cdb9c3884a285d95e
Merge: fb56e32 6b35d5c
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Aug 19 17:33:42 2011 +1000

    Merge branch 'trivia'

 libempathy-gtk/empathy-log-window.c  |    6 +++---
 libempathy-gtk/empathy-log-window.ui |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---



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