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

From: Jonny Lamb <jonnylamb src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 2/2] Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'
Date: Wed, 18 May 2011 14:23:29 +0000 (UTC)

commit 93a7de11fb8ec365c6a7f1818b1260e689e0428e
Merge: 4a5169b c51c43f
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Wed May 18 15:23:15 2011 +0100

    Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'

 extensions/Chat_Manager.xml |    5 +++++
 src/empathy-chat-manager.c  |   18 +++++++++++-------
 src/empathy-chat-manager.h  |    3 ++-
 src/empathy-chat-window.c   |    3 ++-
 4 files changed, 20 insertions(+), 9 deletions(-)
---

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