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

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

commit bd991e625b09bc8c238432511fa4d957be7ded1e
Merge: 9aabf1b 29a1698
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Oct 12 14:37:19 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/Makefile.am                                |   92 ++-
 clutter/clutter-actor.h                            |   71 +--
 clutter/clutter-align-constraint.h                 |   15 -
 clutter/clutter-alpha.h                            |    1 -
 clutter/clutter-animatable.h                       |    2 +-
 clutter/clutter-animator.h                         |   14 -
 clutter/clutter-backend.h                          |   13 +
 clutter/clutter-bin-layout.h                       |   25 -
 clutter/clutter-bind-constraint.h                  |   24 -
 clutter/clutter-box-layout.h                       |   18 -
 clutter/clutter-cairo-texture.h                    |    3 +
 clutter/clutter-click-action.h                     |   17 -
 clutter/clutter-color.h                            |  105 --
 clutter/clutter-deprecated.h                       |  226 +----
 clutter/clutter-device-manager-private.h           |    1 +
 clutter/clutter-drag-action.h                      |   18 -
 clutter/clutter-effect.h                           |   13 -
 clutter/clutter-enums.h                            | 1059 ++++++++++++++++++++
 clutter/clutter-event.h                            |   87 +--
 clutter/clutter-feature.h                          |   36 +-
 clutter/clutter-flow-layout.h                      |   17 -
 clutter/clutter-input-device.h                     |   83 +--
 clutter/clutter-main.c                             |  508 ++++++++--
 clutter/clutter-main.h                             |   28 +-
 clutter/clutter-model.c                            |   12 +-
 clutter/clutter-path.h                             |   37 +-
 clutter/clutter-script-parser.c                    |    2 +-
 clutter/clutter-script.h                           |    1 -
 clutter/clutter-settings-private.h                 |   16 +
 clutter/clutter-settings.c                         |  144 +++-
 clutter/clutter-snap-constraint.h                  |   18 -
 clutter/clutter-stage.h                            |   16 -
 clutter/clutter-state.h                            |    2 -
 clutter/clutter-swipe-action.h                     |   18 -
 clutter/clutter-table-layout.h                     |   19 -
 clutter/clutter-texture.h                          |   41 +-
 clutter/clutter-timeline.h                         |   18 +-
 clutter/clutter-types.h                            |  360 +------
 clutter/clutter-units.h                            |   46 +-
 clutter/clutter-util.h                             |    5 +-
 clutter/clutter.h                                  |   20 +-
 clutter/cogl/clutter-egl.h                         |    2 +
 clutter/{ => deprecated}/clutter-behaviour-depth.c |    2 +-
 clutter/{ => deprecated}/clutter-behaviour-depth.h |    3 +-
 .../{ => deprecated}/clutter-behaviour-ellipse.c   |    2 +-
 .../{ => deprecated}/clutter-behaviour-ellipse.h   |    3 -
 .../{ => deprecated}/clutter-behaviour-opacity.c   |    2 +-
 .../{ => deprecated}/clutter-behaviour-opacity.h   |    3 +-
 clutter/{ => deprecated}/clutter-behaviour-path.c  |    2 +-
 clutter/{ => deprecated}/clutter-behaviour-path.h  |    3 +-
 .../{ => deprecated}/clutter-behaviour-rotate.c    |    4 +-
 .../{ => deprecated}/clutter-behaviour-rotate.h    |    2 -
 clutter/{ => deprecated}/clutter-behaviour-scale.c |    2 +-
 clutter/{ => deprecated}/clutter-behaviour-scale.h |    2 +-
 clutter/{ => deprecated}/clutter-behaviour.c       |    0
 clutter/{ => deprecated}/clutter-behaviour.h       |    3 -
 clutter/{ => deprecated}/clutter-fixed.c           |    0
 clutter/{ => deprecated}/clutter-fixed.h           |    0
 clutter/{ => deprecated}/clutter-frame-source.c    |    0
 clutter/{ => deprecated}/clutter-frame-source.h    |    0
 clutter/{ => deprecated}/clutter-score.c           |    0
 clutter/{ => deprecated}/clutter-score.h           |    0
 clutter/{ => deprecated}/clutter-shader.c          |    0
 clutter/{ => deprecated}/clutter-shader.h          |    0
 .../{ => deprecated}/clutter-timeout-interval.c    |    0
 .../{ => deprecated}/clutter-timeout-interval.h    |    0
 clutter/{ => deprecated}/clutter-timeout-pool.c    |    0
 clutter/{ => deprecated}/clutter-timeout-pool.h    |    0
 clutter/osx/clutter-event-loop-osx.c               |    4 +-
 clutter/osx/clutter-stage-osx.c                    |    2 +-
 clutter/x11/clutter-x11.h                          |    6 +-
 configure.ac                                       |    4 +-
 doc/reference/clutter/clutter-docs.xml.in          |   28 +-
 doc/reference/clutter/clutter-sections.txt         |    9 +
 doc/reference/clutter/running-clutter.xml          |   97 ++
 tests/interactive/test-stage-read-pixels.c         |    3 +-
 tests/interactive/test-threads.c                   |   14 +-
 77 files changed, 1994 insertions(+), 1459 deletions(-)
---