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

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

commit c8ef9affaaedb0eb082478d200d03d9dbaee9d8e
Merge: d82c507 db7f087
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 19 00:39:19 2011 +0800

    Merge branch 'master' into msvc-support
    
    Conflicts:
    	cogl/cogl-debug.h

 cogl/cogl-bitmap.c                    |   10 +-
 cogl/cogl-context-private.h           |   14 +-
 cogl/cogl-context.c                   |   27 +----
 cogl/cogl-debug.h                     |    2 +-
 cogl/cogl-private.h                   |   14 +--
 cogl/driver/gl/cogl-gl.c              |   22 ++--
 cogl/driver/gles/cogl-gles.c          |   16 +--
 cogl/winsys/cogl-texture-pixmap-x11.c |   10 ++-
 cogl/winsys/cogl-winsys-egl.c         |   20 ++-
 cogl/winsys/cogl-winsys-glx.c         |   15 +-
 cogl/winsys/cogl-winsys-stub.c        |    4 +-
 cogl/winsys/cogl-winsys-wgl.c         |   15 +-
 examples/Makefile.am                  |    4 +-
 examples/hello.c                      |    3 +
 examples/x11-tfp.c                    |  234 +++++++++++++++++++++++++++++++++
 15 files changed, 317 insertions(+), 93 deletions(-)
---