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

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

commit 03e1be4c2b59646481a624e199bdffc3b194bc62
Merge: 1971777 39ca3e5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Nov 15 14:05:06 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/cogl-context.c                                |    6 -
 cogl/cogl-framebuffer.c                            |   20 +--
 cogl/cogl-onscreen.c                               |    3 +
 cogl/cogl-pipeline-private.h                       |   14 --
 cogl/cogl-pipeline-state-private.h                 |    8 -
 cogl/cogl-pipeline-state.c                         |   60 ++++++-
 cogl/cogl-pipeline-state.h                         |   91 ++++++++++
 cogl/cogl-pipeline.c                               |    8 +-
 cogl/cogl-types.h                                  |   15 ++
 cogl/cogl-util.h                                   |    1 +
 .../cogl-2.0-experimental-sections.txt             |    5 +
 tests/conform/test-backface-culling.c              |  181 ++++++++++----------
 12 files changed, 270 insertions(+), 142 deletions(-)
---