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

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

commit b55656b6984a6a5f2dd9d12d6adac09efc9b8595
Merge: f0dfd8a 938fcc6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 6 12:04:30 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/clutter-action.h             |    2 +
 clutter/clutter-actor-meta-private.h |    2 +
 clutter/clutter-actor-meta.c         |   21 +
 clutter/clutter-actor.c              |   60 ++
 clutter/clutter-constraint.h         |    2 +
 clutter/clutter-effect.h             |    2 +
 clutter/clutter-fixed.c              |    8 +-
 clutter/clutter-fixed.h              |    8 +
 clutter/clutter-main.c               |    2 +-
 clutter/clutter-paint-volume.c       |    3 +
 clutter/clutter-shader-effect.c      |  236 ++++--
 clutter/clutter-shader-effect.h      |   10 +-
 po/eo.po                             | 1551 +++++++++++++++++-----------------
 po/fr.po                             |  184 +++--
 tests/conform/Makefile.am            |    1 +
 tests/conform/test-conform-main.c    |    1 +
 tests/conform/test-shader-effect.c   |  267 ++++++
 tests/interactive/test-main.c        |    6 +-
 18 files changed, 1425 insertions(+), 941 deletions(-)
---