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

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

commit 54991fa0643dab76e67d02d98aedf3a7b7340cf9
Merge: 54b0549 b3c133f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 6 14:03:35 2011 +0800

    Merge branch 'master' into msvc-support

 COPYING                                            |   20 +-
 NEWS                                               |   36 +++
 README.in                                          |    2 +-
 build/autotools/Makefile.am.release                |    2 +-
 cogl/cogl-atlas-texture.c                          |   83 ++++--
 cogl/cogl-blend-string.c                           |   31 ++-
 cogl/cogl-context.c                                |    7 +-
 cogl/cogl-context.h                                |    4 +
 cogl/cogl-display.c                                |    8 +
 cogl/cogl-display.h                                |    4 +
 cogl/cogl-framebuffer.c                            |    6 +
 cogl/cogl-framebuffer.h                            |   16 +
 cogl/cogl-pipeline-fragend-glsl.c                  |  316 ++++++++++++++------
 cogl/cogl-pipeline-opengl.c                        |   20 --
 cogl/cogl-pipeline-private.h                       |    5 -
 cogl/cogl-pipeline.h                               |    3 -
 cogl/cogl-renderer.c                               |   16 +
 cogl/cogl-renderer.h                               |   16 +
 cogl/cogl-texture-2d-sliced.c                      |   12 +-
 cogl/cogl-texture-2d.c                             |   12 +-
 cogl/cogl-texture-2d.h                             |   12 +-
 cogl/cogl-texture-private.h                        |    6 +-
 cogl/cogl-texture-rectangle.c                      |   12 +-
 cogl/cogl-texture.c                                |   18 +-
 cogl/winsys/cogl-winsys-egl.c                      |    9 +-
 cogl/winsys/cogl-winsys-glx.c                      |    3 +-
 configure.ac                                       |   10 +-
 .../cogl-2.0-experimental-sections.txt             |    3 +
 examples/Makefile.am                               |    3 +-
 po/ar.po                                           |   37 +++
 po/cs.po                                           |   36 +++
 po/eo.po                                           |   34 ++
 po/es.po                                           |   34 ++
 po/fr.po                                           |   34 ++
 po/gl.po                                           |   35 +++
 po/kn.po                                           |   37 +++
 po/lt.po                                           |   34 ++
 po/nb.po                                           |   33 ++
 po/nl.po                                           |   36 +++
 po/pa.po                                           |   37 +++
 po/pt_BR.po                                        |   34 ++
 po/sv.po                                           |   34 ++
 po/zh_HK.po                                        |   34 ++
 po/zh_TW.po                                        |   34 ++
 44 files changed, 1011 insertions(+), 207 deletions(-)
---