[clutter/msvc-support: 12/12] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 12/12] Merge branch 'master' into msvc-support
- Date: Fri, 17 Jun 2011 06:46:15 +0000 (UTC)
commit a1a2d54c24de77239dacf68d6f007e5ff023cdc2
Merge: 0c31bcb daaa4c5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jun 17 15:01:05 2011 +0800
Merge branch 'master' into msvc-support
clutter/clutter-paint-volume.c | 69 +++++---
clutter/clutter-stage.c | 200 ++++++++++++++++++--
configure.ac | 16 +-
tests/accessibility/cally-atkcomponent-example.c | 12 +-
.../accessibility/cally-atkeditabletext-example.c | 18 +-
tests/accessibility/cally-atkevents-example.c | 6 +-
tests/accessibility/cally-atktext-example.c | 10 +-
tests/accessibility/cally-clone-example.c | 10 +-
tests/conform/test-actor-invariants.c | 8 +-
tests/interactive/test-fbo.c | 10 +-
tests/interactive/test-scale.c | 6 +-
tests/interactive/test-unproject.c | 6 +-
12 files changed, 274 insertions(+), 97 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]