[clutter/msvc-support: 14/14] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 14/14] Merge branch 'master' into msvc-support
- Date: Mon, 18 Jul 2011 06:21:32 +0000 (UTC)
commit 598134a233a51b7f8fd0890d9864295f62fb2c4e
Merge: 5c9a426 f1f5d76
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jul 18 14:37:12 2011 +0800
Merge branch 'master' into msvc-support
Conflicts:
po/de.po
clutter/clutter-actor.c | 12 +-
clutter/clutter-gesture-action.c | 13 +-
clutter/clutter-paint-volume.c | 59 ++-
clutter/clutter-private.h | 7 +
clutter/clutter-stage.c | 12 +-
clutter/x11/clutter-device-manager-xi2.c | 18 +-
clutter/x11/clutter-event-x11.c | 25 +
configure.ac | 18 +
po/de.po | 1213 +++++++++++++++---------------
9 files changed, 744 insertions(+), 633 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]