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

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

commit 329416180f01a5e68ebb6216c9d5311b1a3639c2
Merge: 999cc90 b5a7657
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Sep 9 10:35:13 2011 +0800

    Merge branch 'master' into msvc-support

 Makefile.am                                   |    2 +-
 cogl/cogl-xlib-renderer.c                     |    5 +
 configure.ac                                  |    4 +
 po/fa.po                                      |   36 ++
 po/id.po                                      |   33 ++
 po/it.po                                      |   34 ++
 po/sl.po                                      |   39 +++
 tests/Makefile.am                             |   16 +
 tests/README                                  |   63 ++++
 tests/conform/Makefile.am                     |  236 ++++++++++++++
 tests/conform/run-tests.sh                    |   12 +
 tests/conform/test-atlas-migration.c          |  133 ++++++++
 tests/conform/test-backface-culling.c         |  339 +++++++++++++++++++
 tests/conform/test-blend-strings.c            |  434 +++++++++++++++++++++++++
 tests/conform/test-conform-main.c             |  170 ++++++++++
 tests/conform/test-depth-test.c               |  291 +++++++++++++++++
 tests/conform/test-fixed.c                    |   18 +
 tests/conform/test-fixtures.c                 |   12 +
 tests/conform/test-just-vertex-shader.c       |  137 ++++++++
 tests/conform/test-launcher.sh.in             |   25 ++
 tests/conform/test-materials.c                |  285 ++++++++++++++++
 tests/conform/test-multitexture.c             |  206 ++++++++++++
 tests/conform/test-npot-texture.c             |  236 ++++++++++++++
 tests/conform/test-object.c                   |   86 +++++
 tests/conform/test-offscreen.c                |  167 ++++++++++
 tests/conform/test-path.c                     |  234 +++++++++++++
 tests/conform/test-pipeline-user-matrix.c     |  144 ++++++++
 tests/conform/test-pixel-buffer.c             |  330 +++++++++++++++++++
 tests/conform/test-premult.c                  |  367 +++++++++++++++++++++
 tests/conform/test-primitive.c                |  230 +++++++++++++
 tests/conform/test-readpixels.c               |  178 ++++++++++
 tests/conform/test-sub-texture.c              |  371 +++++++++++++++++++++
 tests/conform/test-texture-3d.c               |  230 +++++++++++++
 tests/conform/test-texture-get-set-data.c     |  166 ++++++++++
 tests/conform/test-texture-mipmaps.c          |  136 ++++++++
 tests/conform/test-texture-pixmap-x11.c       |  245 ++++++++++++++
 tests/conform/test-texture-rectangle.c        |  276 ++++++++++++++++
 tests/conform/test-utils.c                    |   80 +++++
 tests/conform/test-utils.h                    |   41 +++
 tests/conform/test-vertex-buffer-contiguous.c |  257 +++++++++++++++
 tests/conform/test-vertex-buffer-interleved.c |  162 +++++++++
 tests/conform/test-vertex-buffer-mutability.c |  198 +++++++++++
 tests/conform/test-viewport.c                 |  416 ++++++++++++++++++++++++
 tests/conform/test-wrap-modes.c               |  317 ++++++++++++++++++
 tests/data/Makefile.am                        |    3 +
 tests/data/valgrind.suppressions              |  173 ++++++++++
 46 files changed, 7572 insertions(+), 1 deletions(-)
---