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

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

commit b0fd2213cb46cd9fd0cc33db377054b54d083cde
Merge: b97557d 18b3da9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jul 14 14:58:12 2011 +0800

    Merge branch 'master' into msvc-support

 clutter/cally/cally-actor-private.h         |    4 +
 clutter/cally/cally-actor.c                 |   43 ++-
 clutter/cally/cally-text.c                  |  545 ++++++++++++++++++++++++---
 clutter/cally/cally-util.c                  |    9 +-
 clutter/clutter-bind-constraint.h           |    2 +-
 clutter/clutter-gesture-action.c            |   21 +-
 clutter/clutter-profile.c                   |    4 +-
 clutter/clutter-score.c                     |    3 +
 clutter/clutter-score.h                     |    4 +
 clutter/clutter-stage-window.c              |   15 +
 clutter/clutter-stage-window.h              |    6 +
 clutter/clutter-stage.c                     |   41 ++
 clutter/clutter-stage.h                     |    4 +
 clutter/clutter-text.c                      |   34 +-
 clutter/clutter-texture.c                   |    4 +
 clutter/clutter-texture.h                   |    4 +
 clutter/cogl/clutter-backend-cogl.c         |    6 +-
 clutter/cogl/clutter-stage-cogl.c           |   37 ++-
 clutter/cogl/clutter-stage-cogl.h           |    4 +
 clutter/osx/clutter-backend-osx.c           |   11 +-
 clutter/osx/clutter-event-osx.c             |    4 +-
 clutter/osx/clutter-stage-osx.c             |   42 ++-
 clutter/win32/clutter-backend-win32.c       |    4 -
 configure.ac                                |   17 +-
 doc/reference/clutter/clutter-sections.txt  |    1 +
 po/POTFILES.in                              |    5 +-
 tests/accessibility/cally-atktext-example.c |  158 ++++++---
 tests/conform/test-cogl-materials.c         |   93 ++++-
 tests/conform/test-pick.c                   |    3 +-
 tests/conform/test-score.c                  |    2 +
 tests/conform/test-texture-fbo.c            |    1 +
 tests/interactive/test-fbo.c                |    1 +
 32 files changed, 925 insertions(+), 207 deletions(-)
---