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

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

commit 5f100f2827846006c4dc394c87366815f0dca54c
Merge: bc917fd f036690
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jul 1 13:35:16 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/Makefile.am                                   |   22 ++-
 cogl/cogl-attribute.c                              |    8 +-
 cogl/cogl-buffer.h                                 |   19 ++-
 cogl/cogl-context.c                                |    2 +
 cogl/cogl-debug.c                                  |   26 ++-
 cogl/cogl-debug.h                                  |    3 +
 cogl/cogl-display.c                                |    3 +
 cogl/cogl-framebuffer-private.h                    |   22 --
 cogl/cogl-framebuffer.c                            |   22 +-
 cogl/cogl-framebuffer.h                            |   29 ++
 ...ay-glx-private.h => cogl-glx-display-private.h} |    8 +-
 ...r-glx-private.h => cogl-glx-renderer-private.h} |    8 +-
 cogl/cogl-journal.c                                |    3 +-
 cogl/cogl-pipeline.c                               |  175 ++++++-------
 cogl/cogl-private.h                                |    3 +
 cogl/cogl-renderer-private.h                       |   18 ++
 cogl/cogl-renderer.c                               |   54 +++-
 cogl/cogl-renderer.h                               |  143 +++-------
 cogl/cogl-texture.c                                |    2 +-
 cogl/cogl-types.h                                  |   22 --
 cogl/cogl-wayland-renderer.h                       |   62 +++++
 cogl/cogl-win32-renderer.c                         |   58 ++++
 cogl/cogl-win32-renderer.h                         |   97 +++++++
 ...r-x11-private.h => cogl-x11-renderer-private.h} |    4 +-
 ...-xlib-private.h => cogl-xlib-display-private.h} |    4 +-
 ...xlib-private.h => cogl-xlib-renderer-private.h} |   30 +-
 .../{cogl-renderer-xlib.c => cogl-xlib-renderer.c} |   60 +++--
 cogl/cogl-xlib-renderer.h                          |  127 +++++++++
 cogl/cogl-xlib.c                                   |   10 +-
 cogl/cogl.c                                        |   26 ++-
 cogl/cogl.h                                        |    4 +
 cogl/winsys/cogl-texture-pixmap-x11.c              |   15 +-
 cogl/winsys/cogl-winsys-egl.c                      |   68 +++---
 cogl/winsys/cogl-winsys-glx.c                      |  148 ++++++------
 cogl/winsys/cogl-winsys-private.h                  |    4 +
 cogl/winsys/cogl-winsys-wgl.c                      |   21 +-
 configure.ac                                       |   12 +-
 doc/RELEASING                                      |    2 +-
 doc/reference/cogl-2.0-experimental/Makefile.am    |    2 +
 .../cogl-2.0-experimental/cogl-docs.xml.in         |    6 +-
 .../cogl-2.0-experimental/cogl-sections.txt        |  120 ++++++---
 examples/Makefile.am                               |   11 +-
 examples/crate.c                                   |  275 ++++++++++++++++++++
 examples/crate.jpg                                 |  Bin 0 -> 171588 bytes
 examples/x11-foreign.c                             |    5 +-
 45 files changed, 1239 insertions(+), 524 deletions(-)
---