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

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

commit 13e32a1f643e5fa0b104db2d223ff1efaa04cc43
Merge: b3f3caf 6f79eb8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Jul 18 13:19:43 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/cogl-context-private.h                     |    2 +
 cogl/cogl-context.c                             |    2 +
 cogl/cogl-framebuffer-private.h                 |    2 +
 cogl/cogl-framebuffer.c                         |   27 ++++++++++++++
 cogl/cogl-framebuffer.h                         |   42 +++++++++++++++++++++++
 cogl/cogl-internal.h                            |    1 +
 cogl/cogl.c                                     |   27 ++++++++++++--
 cogl/driver/gl/cogl-gl.c                        |    3 ++
 cogl/winsys/cogl-winsys-egl-feature-functions.h |    2 +
 configure.ac                                    |    2 +-
 10 files changed, 105 insertions(+), 5 deletions(-)
---