[empathy: 10/10] Merge branch 'clutter-toolbar'

From: Emilio Pozuelo Monfort <epm src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 10/10] Merge branch 'clutter-toolbar'
Date: Mon, 15 Aug 2011 10:59:35 +0000 (UTC)

commit 6881301b5474f90a297b07aa63156d71171f2621
Merge: 8153737 0bfcc41
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Mon Aug 15 11:55:44 2011 +0100

    Merge branch 'clutter-toolbar'

 src/Makefile.am             |    4 +-
 src/empathy-call-window.c   |  134 +++++++++++++++++++++++++++++++++++++++++--
 src/empathy-call-window.ui  |   19 ++++--
 src/empathy-rounded-actor.c |   68 ++++++++++++++++++++++
 src/empathy-rounded-actor.h |   63 ++++++++++++++++++++
 5 files changed, 275 insertions(+), 13 deletions(-)
---

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