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

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

commit 9e822d9ae4d65b0fae2843bc57119b3d879502d7
Merge: ad7bb39 4f5ce6c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 27 14:35:26 2011 +0800

    Merge branch 'master' into msvc-support-master

 build/mingw/mingw-fetch-dependencies.sh |   25 +-
 clutter/clutter-actor.c                 |   29 +-
 clutter/clutter-debug.h                 |    6 +-
 clutter/clutter-main.c                  |   15 +-
 clutter/clutter-master-clock.c          |   14 +
 clutter/clutter-offscreen-effect.c      |   31 +-
 clutter/clutter-paint-volume.c          |    4 -
 clutter/clutter-private.h               |    4 +
 clutter/clutter-settings.c              |   30 +
 clutter/clutter-stage-private.h         |    6 +-
 clutter/clutter-stage-window.c          |   16 +-
 clutter/clutter-stage-window.h          |   26 +-
 clutter/clutter-stage.c                 |  115 +-
 clutter/clutter-state.c                 |    9 +-
 clutter/clutter-text.c                  |   94 ++-
 clutter/clutter-util.c                  |   30 +
 clutter/cogl/clutter-stage-cogl.c       |   29 +-
 clutter/cogl/clutter-stage-cogl.h       |    3 +-
 clutter/osx/clutter-stage-osx.c         |    4 +-
 clutter/wayland/clutter-stage-wayland.c |   64 +-
 clutter/wayland/clutter-stage-wayland.h |    6 +-
 clutter/win32/clutter-stage-win32.c     |   12 +-
 clutter/x11/clutter-stage-x11.c         |    4 +-
 configure.ac                            |    8 +-
 po/as.po                                | 2191 ++++++++++++++++++++++++++++++
 po/ca valencia po                       | 1138 ++++++++--------
 po/da.po                                | 1749 +++++++++++++------------
 po/de.po                                | 1172 ++++++++--------
 po/fr.po                                | 1849 +++++++++++++-------------
 po/or.po                                |    2 +-
 po/pa.po                                | 1199 +++++++++--------
 po/pt.po                                | 2216 +++++++++++++++++++++++++++++++
 po/sr.po                                | 2194 ++++++++++++++++++++++++++++++
 po/sr latin po                          | 2194 ++++++++++++++++++++++++++++++
 po/ta.po                                |  449 +++----
 po/te.po                                | 1126 ++++++++--------
 po/zh_HK.po                             | 1192 +++++++++--------
 po/zh_TW.po                             | 1192 +++++++++--------
 38 files changed, 14834 insertions(+), 5613 deletions(-)
---