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

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

commit 85b2d44e365d868c6f5d59f3eac29dd7d8265a47
Merge: 8f8b43d 8b34a39
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 20 12:49:17 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/cogl-context-private.h                        |    1 +
 cogl/cogl-context.c                                |    1 +
 cogl/cogl-framebuffer-private.h                    |    1 +
 cogl/cogl-framebuffer.c                            |   38 ++++++++
 cogl/cogl-framebuffer.h                            |   34 ++++++++
 cogl/cogl-pipeline-opengl.c                        |   18 ++++
 cogl/cogl-pipeline-private.h                       |   15 +++-
 cogl/cogl-pipeline.c                               |   89 +++++++++++++++++++-
 cogl/cogl-pipeline.h                               |   34 ++++++++
 cogl/cogl-renderer.c                               |   10 +--
 cogl/cogl-types.h                                  |   26 ++++++
 cogl/driver/gles/cogl-gles.c                       |    2 +-
 cogl/winsys/cogl-winsys-glx.c                      |    8 +--
 configure.ac                                       |   32 ++++++--
 .../cogl-2.0-experimental-sections.txt             |    6 ++
 15 files changed, 289 insertions(+), 26 deletions(-)
---