[cogl/msvc-support-1.8: 4/4] Merge branch 'cogl-1.8' into msvc-support-1.8

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

commit ca96da3ffd56aab654eca37835ff7e370767b6cf
Merge: 22e5bf9 4e59e56
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Nov 7 11:24:13 2011 +0800

    Merge branch 'cogl-1.8' into msvc-support-1.8

 cogl/cogl-context.c                |    4 ++--
 cogl/cogl-pipeline-fragend-glsl.c  |   30 +++++++++++++++++-------------
 cogl/cogl-pipeline-opengl.c        |   13 ++++++++++++-
 cogl/cogl-pipeline-private.h       |    3 ++-
 cogl/cogl-pipeline-progend-glsl.c  |   28 ++++++----------------------
 cogl/cogl-pipeline-vertend-fixed.c |    3 ++-
 cogl/cogl-pipeline-vertend-glsl.c  |   27 +++++++++++++++++++--------
 cogl/cogl-program.c                |    1 +
 cogl/cogl-shader.c                 |   10 ++++++----
 9 files changed, 67 insertions(+), 52 deletions(-)
---