[empathy: 4/4] Merge branch 'moblin'

From: Cosimo Cecchi <cosimoc src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [empathy: 4/4] Merge branch 'moblin'
Date: Mon, 28 Sep 2009 14:44:49 +0000 (UTC)

commit c637daaf5750c1809e05ff39fa2070591410aac3
Merge: ea2be64... 51e36d3...
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Sep 28 16:39:59 2009 +0200

    Merge branch 'moblin'
    
    Conflicts:
    	libempathy-gtk/empathy-account-widget.c

 configure.ac                            |   28 +++++++++++
 libempathy-gtk/Makefile.am              |    2 +
 libempathy-gtk/empathy-account-widget.c |   78 +++++++++++++++++++++++++++++--
 3 files changed, 103 insertions(+), 5 deletions(-)
---

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