[cogl/msvc-support: 24/24] Merge branch 'master' into msvc-support

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

commit a8e0c278a43a4916faeb04f51a3b0ccf60682612
Merge: 2b7da6c bbfe8b8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jun 2 14:35:21 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/Makefile.am                                |   33 +-
 cogl/cogl-atlas.c                               |   12 +-
 cogl/cogl-blit.c                                |    2 +-
 cogl/cogl-clutter.c                             |    3 +-
 cogl/cogl-context-private.h                     |    2 +-
 cogl/cogl-context.c                             |   20 +-
 cogl/cogl-defines.h.in                          |   10 +-
 cogl/cogl-display-private.h                     |    7 +
 cogl/cogl-display.c                             |   14 +-
 cogl/cogl-display.h                             |    6 +
 cogl/cogl-feature-private.c                     |   35 +-
 cogl/cogl-feature-private.h                     |    8 +-
 cogl/cogl-framebuffer.c                         |   15 +-
 cogl/cogl-internal.h                            |    7 +
 cogl/cogl-journal-private.h                     |   12 +
 cogl/cogl-journal.c                             |   58 +++-
 cogl/cogl-renderer-xlib-private.h               |   17 +-
 cogl/cogl-renderer.c                            |   28 +-
 cogl/cogl-renderer.h                            |    6 +-
 cogl/cogl-texture-2d-private.h                  |   33 +-
 cogl/cogl-texture-2d-sliced.c                   |   12 +-
 cogl/cogl-texture-2d.c                          |  213 ++++++++-
 cogl/cogl-texture-2d.h                          |  219 +++++++++
 cogl/cogl-texture.c                             |   28 +-
 cogl/cogl-texture.h                             |   28 ++
 cogl/cogl-xlib-private.h                        |   27 --
 cogl/cogl-xlib.c                                |   86 +----
 cogl/cogl.c                                     |   26 +-
 cogl/cogl.h                                     |    1 +
 cogl/driver/gl/cogl-feature-functions-gl.h      |   12 +
 cogl/driver/gl/cogl-gl.c                        |   26 +-
 cogl/driver/gles/cogl-feature-functions-gles.h  |   12 +
 cogl/driver/gles/cogl-gles.c                    |   26 +-
 cogl/winsys/cogl-texture-pixmap-x11.c           |   20 +-
 cogl/winsys/cogl-winsys-egl-feature-functions.h |   41 ++-
 cogl/winsys/cogl-winsys-egl-private.h           |   46 ++
 cogl/winsys/cogl-winsys-egl.c                   |  269 +++++++++--
 cogl/winsys/cogl-winsys-glx.c                   |   43 +--
 cogl/winsys/cogl-winsys-private.h               |    4 +
 cogl/winsys/cogl-winsys-quartz.c                |   94 ----
 cogl/winsys/cogl-winsys-stub-private.h          |   30 ++
 cogl/winsys/cogl-winsys-stub.c                  |  137 ++++--
 cogl/winsys/cogl-winsys-wgl.c                   |    3 +-
 cogl/winsys/cogl-winsys.c                       |   31 ++
 configure.ac                                    |  151 +++----
 doc/reference/cogl/cogl-sections.txt            |   10 +
 examples/Makefile.am                            |    6 +
 examples/cogland.c                              |  543 +++++++++++++++++++++++
 48 files changed, 1814 insertions(+), 658 deletions(-)
---