[empathy: 4/4] Merge branch 'butterfly-conference-misc'

From: Jonny Lamb <jonnylamb src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 4/4] Merge branch 'butterfly-conference-misc'
Date: Thu, 11 Mar 2010 11:37:47 +0000 (UTC)

commit 02141c6718553ad9bf05afee05e1ef834d3bdd62
Merge: c1dd662 2a98cb3
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Thu Mar 11 11:35:45 2010 +0000

    Merge branch 'butterfly-conference-misc'

 libempathy/empathy-dispatcher.c |    5 +++--
 libempathy/empathy-tp-chat.c    |   10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
---

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