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

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

commit 1a53fa0184d1104b727ecc8f5f357ccd03f97098
Merge: f8c4e0a 30f8521
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Sep 22 12:47:38 2011 +0800

    Merge branch 'master' into msvc-support

 NEWS                                            |   64 +-
 README.in                                       |   12 +-
 build/mingw/mingw-fetch-dependencies.sh         |   22 +-
 cogl-pango/cogl-pango-display-list.c            |   10 +-
 cogl-pango/cogl-pango-display-list.h            |    2 +-
 cogl-pango/cogl-pango-glyph-cache.c             |   12 +-
 cogl-pango/cogl-pango-glyph-cache.h             |   22 +-
 cogl-pango/cogl-pango-pipeline-cache.c          |    8 +-
 cogl-pango/cogl-pango-render.c                  |    6 +-
 cogl/Makefile.am                                |   15 +-
 cogl/cogl-atlas-texture.c                       |    2 +-
 cogl/cogl-attribute-private.h                   |    8 +-
 cogl/cogl-attribute.c                           |   69 +-
 cogl/cogl-blit.c                                |    3 +-
 cogl/cogl-clip-stack.c                          |    3 +-
 cogl/cogl-context-private.h                     |    6 +-
 cogl/cogl-context.c                             |   24 +-
 cogl/cogl-ext-functions.h                       |    2 +
 cogl/cogl-framebuffer-private.h                 |    6 +-
 cogl/cogl-framebuffer.c                         |  144 +-
 cogl/cogl-internal.h                            |   18 +-
 cogl/cogl-journal-private.h                     |    2 +-
 cogl/cogl-journal.c                             |   20 +-
 cogl/cogl-node-private.h                        |   85 +
 cogl/cogl-node.c                                |  103 +
 cogl/cogl-offscreen.h                           |   11 +-
 cogl/cogl-pipeline-debug.c                      |  284 ++
 cogl/cogl-pipeline-fragend-arbfp.c              |    5 +-
 cogl/cogl-pipeline-fragend-glsl.c               |    5 +-
 cogl/cogl-pipeline-layer-private.h              |  380 ++
 cogl/cogl-pipeline-layer-state-private.h        |  126 +
 cogl/cogl-pipeline-layer-state.c                | 1664 ++++++++
 cogl/cogl-pipeline-layer-state.h                |  503 +++
 cogl/cogl-pipeline-layer.c                      |  788 ++++
 cogl/cogl-pipeline-opengl.c                     |   70 +-
 cogl/cogl-pipeline-private.h                    |  469 +--
 cogl/cogl-pipeline-state-private.h              |  142 +
 cogl/cogl-pipeline-state.c                      | 1457 +++++++
 cogl/cogl-pipeline-state.h                      |  693 ++++
 cogl/cogl-pipeline.c                            | 4868 ++---------------------
 cogl/cogl-pipeline.h                            | 1043 +-----
 cogl/cogl-primitive-private.h                   |    7 +-
 cogl/cogl-primitive.c                           |  104 +-
 cogl/cogl-primitives.c                          |   94 +-
 cogl/cogl-private.h                             |    8 +
 cogl/cogl-sub-texture.c                         |    4 +-
 cogl/cogl-texture-2d-sliced.c                   |    4 +-
 cogl/cogl-texture-private.h                     |   35 +-
 cogl/cogl-texture.c                             |  414 +--
 cogl/cogl-texture.h                             |  165 +-
 cogl/cogl-types.h                               |    4 +
 cogl/cogl.c                                     |  135 +-
 cogl/cogl.h                                     |    8 +-
 cogl/cogl2-path.c                               |   20 +-
 cogl/winsys/cogl-texture-pixmap-x11.c           |    2 +-
 cogl/winsys/cogl-winsys-egl.c                   |    8 +-
 cogl/winsys/cogl-winsys-glx-feature-functions.h |    2 +-
 cogl/winsys/cogl-winsys-glx.c                   |   12 +-
 configure.ac                                    |   10 +-
 doc/RELEASING                                   |    6 +-
 doc/reference/cogl-2.0-experimental/Makefile.am |    2 +
 doc/reference/cogl/Makefile.am                  |    2 +
 examples/crate.c                                |    2 +-
 po/da.po                                        |   35 +
 po/eu.po                                        |   36 +
 po/hu.po                                        |   36 +
 tests/conform/Makefile.am                       |    3 +-
 tests/conform/test-backface-culling.c           |  167 +-
 tests/conform/test-color-mask.c                 |  119 +
 tests/conform/test-conform-main.c               |    3 +-
 tests/conform/test-utils.c                      |    6 +-
 71 files changed, 7921 insertions(+), 6708 deletions(-)
---
diff --cc cogl/Makefile.am
index 1351b38,54485c3..90c22e6
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@@ -96,8 -96,11 +96,11 @@@ cogl_experimental_h = 
  	$(srcdir)/cogl-renderer.h 		\
  	$(srcdir)/cogl-swap-chain.h 		\
  	$(srcdir)/cogl-onscreen-template.h 	\
 -	$(srcdir)/cogl-display.h 		\
 +	$(srcdir)/cogl-display.h		\
  	$(srcdir)/cogl-context.h 		\
+ 	$(srcdir)/cogl-pipeline.h 		\
+ 	$(srcdir)/cogl-pipeline-state.h 	\
+ 	$(srcdir)/cogl-pipeline-layer-state.h 	\
  	$(srcdir)/cogl2-path.h 			\
  	$(srcdir)/cogl2-clip-state.h		\
  	$(srcdir)/cogl2-experimental.h		\