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

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

commit b1780711f75fe9a36e95cc1d8599508d2d7d3352
Merge: 0ee89f1 f75dfcf
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Oct 17 15:52:57 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/clutter-actor.c                        |   40 +-
 clutter/clutter-align-constraint.c             |   15 +-
 clutter/clutter-debug.h                        |    6 +-
 clutter/clutter-deform-effect.c                |    2 +-
 clutter/clutter-enums.h                        |    6 +-
 clutter/clutter-main.c                         |   64 +-
 clutter/clutter-path.c                         |   62 ++
 clutter/clutter-texture.c                      |    6 +-
 clutter/deprecated/clutter-behaviour-depth.c   |    2 +
 clutter/deprecated/clutter-behaviour-depth.h   |    8 +-
 clutter/deprecated/clutter-behaviour-ellipse.c |    2 +
 clutter/deprecated/clutter-behaviour-ellipse.h |   22 +-
 clutter/deprecated/clutter-behaviour-opacity.c |    2 +
 clutter/deprecated/clutter-behaviour-opacity.h |    7 +-
 clutter/deprecated/clutter-behaviour-path.c    |    2 +
 clutter/deprecated/clutter-behaviour-path.h    |   10 +-
 clutter/deprecated/clutter-behaviour-rotate.c  |    2 +
 clutter/deprecated/clutter-behaviour-rotate.h  |   13 +-
 clutter/deprecated/clutter-behaviour-scale.c   |    2 +
 clutter/deprecated/clutter-behaviour-scale.h   |    8 +-
 clutter/deprecated/clutter-behaviour.c         |   96 +--
 clutter/deprecated/clutter-behaviour.h         |   14 +-
 clutter/deprecated/clutter-fixed.c             |    2 +
 clutter/deprecated/clutter-fixed.h             |   10 +-
 clutter/deprecated/clutter-frame-source.c      |    2 +
 clutter/deprecated/clutter-frame-source.h      |    8 +-
 clutter/deprecated/clutter-score.c             |    2 +
 clutter/deprecated/clutter-score.h             |   18 +-
 clutter/deprecated/clutter-shader.c            |   16 +-
 clutter/deprecated/clutter-shader.h            |   22 +-
 clutter/deprecated/clutter-timeout-interval.c  |    2 +
 clutter/deprecated/clutter-timeout-pool.c      |    2 +
 clutter/deprecated/clutter-timeout-pool.h      |   10 +-
 clutter/osx/clutter-backend-osx.c              |    2 -
 clutter/win32/clutter-backend-win32.c          |    3 -
 configure.ac                                   |    4 +-
 po/POTFILES.in                                 |   10 +
 po/gl.po                                       | 1132 ++++++++++++------------
 tests/conform/Makefile.am                      |    4 +-
 tests/conform/test-clutter-cairo-texture.c     |    1 -
 tests/conform/test-texture-fbo.c               |    2 -
 tests/interactive/Makefile.am                  |    4 +-
 tests/interactive/test-actors.c                |    3 +-
 tests/interactive/test-cairo-flowers.c         |    2 -
 tests/interactive/test-constraints.c           |    7 +-
 tests/interactive/test-fbo.c                   |    2 -
 tests/interactive/test-main.c                  |    2 +-
 tests/interactive/test-scrolling.c             |    3 +-
 tests/interactive/test-shader.c                |    4 -
 tests/interactive/test-snap-constraint.c       |    3 +-
 tests/interactive/test-state-script.c          |    3 +-
 tests/interactive/test-threads.c               |   51 +-
 52 files changed, 953 insertions(+), 774 deletions(-)
---