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

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

commit 1b7249a2478b78a4242c766d85347e71c3a70ba4
Merge: c52d06a 65a07db
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Nov 14 11:40:49 2011 +0800

    Merge branch 'master' into msvc-support-master

 .gitignore                                   |    2 +-
 README.in                                    |   79 ++-
 clutter/Makefile.am                          |   13 +-
 clutter/cally/cally-text.c                   |   12 +-
 clutter/cex100/clutter-backend-cex100.c      |  214 ++++
 clutter/cex100/clutter-backend-cex100.h      |   71 ++
 clutter/{egl => cex100}/clutter-cex100.h.in  |   37 +-
 clutter/clutter-backend-private.h            |   18 +-
 clutter/clutter-backend.c                    |  311 ++++++-
 clutter/clutter-color.c                      |   27 +-
 clutter/clutter-device-manager.c             |    7 +-
 clutter/clutter-main.c                       |   23 +
 clutter/clutter-private.h                    |    2 +
 clutter/clutter-stage-window.c               |   19 +
 clutter/cogl/clutter-backend-cogl.c          |  207 ----
 clutter/cogl/clutter-backend-cogl.h          |   70 --
 clutter/cogl/clutter-stage-cogl.c            |   44 +-
 clutter/cogl/clutter-stage-cogl.h            |    8 +-
 clutter/egl/clutter-backend-eglnative.c      |  213 +----
 clutter/egl/clutter-backend-eglnative.h      |    8 +-
 clutter/egl/clutter-egl.h                    |    5 -
 clutter/evdev/clutter-device-manager-evdev.c |   12 +-
 clutter/gdk/clutter-backend-gdk.c            |  205 ++--
 clutter/gdk/clutter-backend-gdk.h            |    9 +-
 clutter/gdk/clutter-event-gdk.c              |   21 -
 clutter/osx/clutter-backend-osx.c            |   67 +-
 clutter/osx/clutter-backend-osx.h            |    6 +-
 clutter/osx/clutter-event-osx.c              |   14 -
 clutter/osx/clutter-stage-osx.c              |   59 +-
 clutter/osx/clutter-stage-osx.h              |    3 -
 clutter/wayland/clutter-backend-wayland.c    |   34 +-
 clutter/wayland/clutter-stage-wayland.c      |   37 +
 clutter/win32/clutter-backend-win32.c        |  169 +---
 clutter/win32/clutter-backend-win32.h        |    2 -
 clutter/win32/clutter-stage-win32.c          |   50 +-
 clutter/x11/clutter-backend-x11-private.h    |   32 -
 clutter/x11/clutter-backend-x11.c            |  196 ++--
 clutter/x11/clutter-backend-x11.h            |   40 +-
 clutter/x11/clutter-event-x11.c              |  173 +---
 clutter/x11/clutter-stage-x11.c              |    7 +-
 configure.ac                                 |  179 ++--
 doc/reference/clutter/Makefile.am            |    5 +-
 po/POTFILES.in                               |   12 +-
 po/clutter-1.0.pot                           | 1455 +++++++++++++-------------
 po/es.po                                     |  770 +++++++-------
 po/gl.po                                     |  765 +++++++-------
 tests/conform/test-color.c                   |   34 +-
 tests/conform/test-conform-main.c            |    3 +-
 48 files changed, 2871 insertions(+), 2878 deletions(-)
---