[clutter/msvc-support: 16/17] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit daffa025859b7b8d7f811639085c23c47b525746
Merge: 79b55ad f971c2c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 21 13:15:48 2011 +0800

    Merge branch 'master' into msvc-support

 clutter/Makefile.am                        |    6 +-
 clutter/clutter-behaviour-depth.c          |    4 +
 clutter/clutter-behaviour-ellipse.c        |    3 +
 clutter/clutter-behaviour-opacity.c        |    4 +
 clutter/clutter-behaviour-path.c           |    3 +
 clutter/clutter-behaviour-rotate.c         |    4 +
 clutter/clutter-behaviour-scale.c          |    4 +
 clutter/clutter-behaviour.c                |    5 +-
 clutter/clutter-device-manager.c           |    2 +-
 clutter/clutter-drag-action.c              |   42 ++-
 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-main.c                     |   24 +-
 clutter/clutter-main.h                     |    3 +-
 clutter/clutter-marshal.list               |    1 +
 clutter/clutter-private.h                  |   21 +-
 clutter/clutter-stage-private.h            |   12 +-
 clutter/clutter-stage.c                    |  117 +++++++-
 clutter/clutter-stage.h                    |    5 +
 clutter/clutter-types.h                    |    4 +
 clutter/clutter.h                          |    1 +
 clutter/cogl/clutter-glx-texture-pixmap.h  |    2 +-
 configure.ac                               |   34 +-
 doc/reference/clutter/Makefile.am          |   29 +-
 doc/reference/clutter/clutter-docs.xml.in  |    2 +
 doc/reference/clutter/clutter-sections.txt |   65 +++--
 doc/reference/clutter/clutter.types        |    1 +
 tests/interactive/Makefile.am              |    3 +-
 tests/interactive/test-drop.c              |  245 +++++++++++++++
 tests/interactive/test-events.c            |   11 +-
 tests/interactive/test-grab.c              |   10 +-
 33 files changed, 1152 insertions(+), 102 deletions(-)
---