[empathy: 4/4] Merge remote-tracking branch 'em/fix-highlight-roundedness-671720'
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 4/4] Merge remote-tracking branch 'em/fix-highlight-roundedness-671720'
- Date: Mon, 12 Mar 2012 12:02:48 +0000 (UTC)
commit 1413b47d30284825bc81ed606c458a5fa60f830f
Merge: afcd810 6fe60c8
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Mar 12 13:02:18 2012 +0100
Merge remote-tracking branch 'em/fix-highlight-roundedness-671720'
configure.ac | 11 ++++---
src/empathy-call-window.c | 35 +++++++++++++-----------
src/empathy-rounded-actor.c | 11 +++-----
src/empathy-rounded-actor.h | 5 +---
src/empathy-rounded-rectangle.c | 58 +++++++++++++++++++++++++--------------
src/empathy-rounded-rectangle.h | 5 ++-
6 files changed, 70 insertions(+), 55 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]