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

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

commit f919945783222228826da46ccf06acda4622bdda
Merge: 069d20f e83a785
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 27 12:17:02 2011 +0800

    Merge branch 'master' into msvc-support

 clutter.doap                                  |    2 +-
 clutter/Makefile.am                           |    2 +
 clutter/cally/ChangeLog.pre-cally-merge       |  986 +++++++++++++++++++++++++
 clutter/cally/cally-actor.c                   |   99 +---
 clutter/cally/cally-clone.c                   |   21 +-
 clutter/cally/cally-rectangle.c               |   21 +-
 clutter/cally/cally-root.c                    |    4 +
 clutter/cally/cally-stage.c                   |   40 -
 clutter/cally/cally-texture.c                 |   19 -
 clutter/clutter-actor-meta-private.h          |   26 +
 clutter/clutter-actor-meta.c                  |  117 +++-
 clutter/clutter-actor-private.h               |    5 +
 clutter/clutter-actor.c                       |  804 +++++++++++++++------
 clutter/clutter-actor.h                       |   37 +-
 clutter/clutter-clone.c                       |   14 +
 clutter/clutter-effect-private.h              |    2 +
 clutter/clutter-effect.c                      |  184 ++++-
 clutter/clutter-effect.h                      |   21 +-
 clutter/clutter-flatten-effect.c              |   56 ++
 clutter/clutter-flatten-effect.h              |   73 ++
 clutter/clutter-id-pool.c                     |    3 +-
 clutter/clutter-main.c                        |    2 +-
 clutter/clutter-offscreen-effect.c            |   88 ++-
 clutter/clutter-private.h                     |    2 +-
 clutter/clutter-rectangle.c                   |    9 +
 clutter/clutter-text.c                        |  200 +++++-
 clutter/clutter-text.h                        |    5 +
 clutter/clutter-texture.c                     |    9 +
 doc/cookbook/examples/text-shadow.c           |    2 +-
 doc/reference/clutter/Makefile.am             |    6 +-
 doc/reference/clutter/clutter-sections.txt    |    7 +
 doc/reference/clutter/offscreen-redirect.png  |  Bin 0 -> 4821 bytes
 po/cs.po                                      |  591 ++++++++-------
 po/es.po                                      |  570 ++++++++-------
 po/sl.po                                      |  600 ++++++++--------
 tests/accessibility/cally-atkevents-example.c |    7 +-
 tests/accessibility/cally-examples-util.c     |   10 +-
 tests/accessibility/cally-examples-util.h     |    2 +-
 tests/conform/Makefile.am                     |    1 +
 tests/conform/test-cogl-blend-strings.c       |    8 +-
 tests/conform/test-cogl-depth-test.c          |   30 +-
 tests/conform/test-cogl-pixel-buffer.c        |   20 +-
 tests/conform/test-cogl-sub-texture.c         |    5 +-
 tests/conform/test-conform-main.c             |    1 +
 tests/conform/test-offscreen-redirect.c       |  324 ++++++++
 tests/interactive/test-box-layout.c           |    2 +-
 tests/interactive/test-table-layout.c         |    2 +-
 tests/interactive/test-text-field.c           |    2 +
 tests/interactive/test-text.c                 |    2 +
 49 files changed, 3659 insertions(+), 1384 deletions(-)
---