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

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

commit 6a6f09a9bb456925c75aa465a177b968e266bf5a
Merge: 53c8879 19e1dcf
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 27 11:59:26 2011 +0800

    Merge branch 'master' into msvc-support

 .vimrc                                             |    5 +
 cogl-pango/Makefile.am                             |    6 +-
 cogl/Makefile.am                                   |   42 +-
 ...y-private.h => cogl-attribute-buffer-private.h} |    9 +-
 ...cogl-vertex-array.c => cogl-attribute-buffer.c} |   24 +-
 ...cogl-vertex-array.h => cogl-attribute-buffer.h} |   30 +-
 cogl/cogl-attribute-private.h                      |   26 +-
 cogl/cogl-attribute.c                              |  207 ++++---
 cogl/cogl-attribute.h                              |   39 +-
 cogl/cogl-buffer-private.h                         |    8 +-
 cogl/cogl-buffer.c                                 |    6 +-
 cogl/cogl-context.h                                |   19 +-
 cogl/cogl-defines.h.in                             |   15 +
 ...-array-private.h => cogl-depth-state-private.h} |   17 +-
 cogl/cogl-depth-state.c                            |  108 ++++
 cogl/cogl-depth-state.h                            |  261 ++++++++
 cogl/cogl-euler.c                                  |  183 ++++++
 cogl/cogl-euler.h                                  |  253 ++++++++
 cogl/cogl-framebuffer.c                            |    8 +-
 ...array-private.h => cogl-index-buffer-private.h} |    9 +-
 cogl/{cogl-index-array.c => cogl-index-buffer.c}   |   60 +--
 cogl/{cogl-index-array.h => cogl-index-buffer.h}   |   26 +-
 cogl/cogl-indices-private.h                        |    4 +-
 cogl/cogl-indices.c                                |   34 +-
 cogl/cogl-indices.h                                |   14 +-
 cogl/cogl-journal.c                                |   75 ++--
 cogl/cogl-material-compat.c                        |   65 +--
 cogl/cogl-material-compat.h                        |  166 +-----
 cogl/cogl-matrix-mesa.c                            |   38 ++
 cogl/cogl-matrix-mesa.h                            |    5 +
 cogl/cogl-matrix.c                                 |    9 +
 cogl/cogl-matrix.h                                 |   22 +-
 cogl/{cogl-index-array-private.h => cogl-pango.h}  |   28 +-
 cogl/cogl-path-private.h                           |   10 +-
 cogl/cogl-pipeline-opengl.c                        |   38 +-
 cogl/cogl-pipeline-private.h                       |   11 +-
 cogl/cogl-pipeline.c                               |  234 ++------
 cogl/cogl-pipeline.h                               |  161 +-----
 ...array-private.h => cogl-pixel-buffer-private.h} |   12 +-
 cogl/{cogl-pixel-array.c => cogl-pixel-buffer.c}   |   52 +-
 cogl/{cogl-pixel-array.h => cogl-pixel-buffer.h}   |   52 +-
 cogl/cogl-primitive-private.h                      |    2 +-
 cogl/cogl-primitive.c                              |  203 +++---
 cogl/cogl-primitive.h                              |   27 +-
 cogl/cogl-primitives.c                             |   49 +-
 ...x-array-private.h => cogl-quaternion-private.h} |   26 +-
 cogl/cogl-quaternion.c                             |  654 ++++++++++++++++++++
 cogl/cogl-quaternion.h                             |  493 +++++++++++++++
 cogl/cogl-rectangle-map.c                          |   12 +-
 cogl/cogl-texture.c                                |   14 +-
 cogl/cogl-types.h                                  |   24 +
 cogl/cogl-vertex-buffer-private.h                  |    4 +-
 cogl/cogl-vertex-buffer.c                          |   47 +-
 cogl/cogl.h                                        |    9 +-
 cogl/cogl2-path.c                                  |  136 ++--
 cogl/driver/gl/cogl-gl.c                           |    3 +-
 cogl/driver/gles/cogl-gles.c                       |    1 +
 cogl/winsys/cogl-winsys-egl.c                      |   94 +++-
 cogl/winsys/cogl-winsys-quartz.c                   |   94 +++
 configure.ac                                       |  131 ++++-
 doc/reference/cogl-2.0/Makefile.am                 |    5 +-
 doc/reference/cogl-2.0/cogl-docs.xml.in            |    1 +
 doc/reference/cogl-2.0/cogl-sections.txt           |   53 ++
 doc/reference/cogl/Makefile.am                     |    9 +-
 doc/reference/cogl/cogl-docs.xml.in                |    1 +
 doc/reference/cogl/cogl-sections.txt               |   62 ++-
 examples/android/hello/.gitignore                  |    8 +
 examples/android/hello/AndroidManifest.xml         |   30 +
 examples/android/hello/jni/Android.mk              |   19 +
 examples/android/hello/jni/Application.mk          |    1 +
 examples/android/hello/jni/main.c                  |  188 ++++++
 examples/android/hello/res/values/strings.xml      |    4 +
 72 files changed, 3547 insertions(+), 1248 deletions(-)
---