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

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

commit 542f583bcbac7191e885de950a483aecc2ea93a2
Merge: b7910af ee4adef
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jul 14 14:43:45 2011 +0800

    Merge branch 'master' into msvc-support

 .gitignore                                 |    2 +-
 cogl/Makefile.am                           |    2 +
 cogl/cogl-context-private.h                |    5 +-
 cogl/cogl-context.c                        |    9 +-
 cogl/cogl-pipeline-cache.c                 |  236 +++++++++++++
 cogl/cogl-pipeline-cache.h                 |   77 ++++
 cogl/cogl-pipeline-fragend-arbfp-private.h |    7 -
 cogl/cogl-pipeline-fragend-arbfp.c         |  518 ++++++++++------------------
 cogl/cogl-pipeline-fragend-fixed.c         |    1 -
 cogl/cogl-pipeline-fragend-glsl.c          |  355 +++++++++-----------
 cogl/cogl-pipeline-private.h               |   17 -
 cogl/cogl-pipeline-progend-glsl.c          |  415 ++++++++++++----------
 cogl/cogl-pipeline-vertend-glsl.c          |  156 +++++----
 cogl/cogl-pipeline.c                       |   16 -
 po/.gitignore                              |    2 +
 15 files changed, 987 insertions(+), 831 deletions(-)
---