[clutter/msvc-support-2.0: 46/46] Merge branch 'clutter-1.99' into msvc-support-2.0
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support-2.0: 46/46] Merge branch 'clutter-1.99' into msvc-support-2.0
- Date: Fri, 1 Jul 2011 06:02:39 +0000 (UTC)
commit 6f06ab7c2f4763223b4c5493bab32fda8cbc241a
Merge: 9dab0b5 eae2ab6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jul 1 14:17:54 2011 +0800
Merge branch 'clutter-1.99' into msvc-support-2.0
clutter/Makefile.am | 14 +-
clutter/clutter-actor-private.h | 6 +-
clutter/clutter-actor.c | 192 +++--
clutter/clutter-debug.h | 3 +-
clutter/clutter-device-manager.c | 2 +-
clutter/clutter-drag-action.c | 48 +-
clutter/clutter-drop-action.c | 469 +++++++++++
clutter/clutter-drop-action.h | 113 +++
clutter/clutter-effect.h | 3 +-
clutter/clutter-gesture-action.c | 2 +-
clutter/clutter-group.c | 12 +-
clutter/clutter-keysyms.h | 106 +++-
clutter/clutter-main.c | 72 +--
clutter/clutter-main.h | 4 -
clutter/clutter-marshal.list | 1 +
clutter/clutter-paint-volume.c | 36 +-
clutter/clutter-private.h | 21 +-
clutter/clutter-stage-private.h | 12 +-
clutter/clutter-stage.c | 110 +++-
clutter/clutter-stage.h | 4 +
clutter/clutter-texture.c | 14 +-
clutter/clutter-types.h | 4 +
clutter/clutter.h | 1 +
clutter/cogl/clutter-glx-texture-pixmap.c | 158 ----
clutter/cogl/clutter-glx-texture-pixmap.h | 92 --
clutter/cogl/clutter-glx.h | 46 -
clutter/cogl/clutter-stage-cogl.c | 17 +-
clutter/osx/clutter-backend-osx.c | 3 -
clutter/win32/clutter-backend-win32.c | 3 -
clutter/x11/clutter-backend-x11.c | 23 -
clutter/x11/clutter-stage-x11.c | 31 -
clutter/x11/clutter-x11.h | 8 -
configure.ac | 34 +-
doc/reference/clutter/Makefile.am | 28 +-
doc/reference/clutter/clutter-docs.xml.in | 2 +-
doc/reference/clutter/clutter-sections.txt | 46 +-
doc/reference/clutter/clutter.types | 1 +
doc/reference/clutter/constraints-example.png | Bin 5985 -> 6199 bytes
po/es.po | 1103 +++++++++++++------------
tests/interactive/Makefile.am | 3 +-
tests/interactive/test-drop.c | 245 ++++++
tests/interactive/test-events.c | 11 +-
tests/interactive/test-grab.c | 10 +-
43 files changed, 1868 insertions(+), 1245 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]