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

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

commit f72f781e8c426dddff39b0d9c605e205514b7a8f
Merge: 68c7051 c383fde
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Apr 22 11:21:03 2011 +0800

    Merge branch 'master' into msvc-support

 clutter/cogl/cogl/Makefile.am                      |    1 +
 clutter/cogl/cogl/cogl-bitmask.h                   |    4 +
 clutter/cogl/cogl/cogl-context-private.h           |    4 +-
 clutter/cogl/cogl/cogl-context.c                   |    5 +-
 clutter/cogl/cogl/cogl-debug.c                     |    4 +-
 clutter/cogl/cogl/cogl-debug.h                     |   23 +-
 clutter/cogl/cogl/cogl-flags.h                     |   89 ++++
 clutter/cogl/cogl/cogl-renderer-private.h          |    2 +
 clutter/cogl/cogl/cogl-renderer-xlib-private.h     |    2 -
 clutter/cogl/cogl/cogl-renderer-xlib.c             |   88 ----
 clutter/cogl/cogl/cogl-renderer.c                  |   82 +++
 clutter/cogl/cogl/cogl-renderer.h                  |   86 ++--
 clutter/cogl/cogl/cogl-types.h                     |   45 +-
 clutter/cogl/cogl/cogl-xlib-private.h              |   10 +-
 clutter/cogl/cogl/cogl-xlib.c                      |   86 +---
 clutter/cogl/cogl/cogl-xlib.h                      |    2 +-
 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c |    9 +-
 clutter/cogl/cogl/winsys/cogl-winsys-glx.c         |   68 ++--
 clutter/cogl/cogl/winsys/cogl-winsys-stub.c        |    7 -
 clutter/cogl/cogl/winsys/cogl-winsys.c             |    9 +
 clutter/glx/clutter-backend-glx.c                  |    6 +-
 clutter/x11/clutter-backend-x11.c                  |    6 +-
 po/de.po                                           |  517 ++++++++++----------
 23 files changed, 602 insertions(+), 553 deletions(-)
---