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

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

commit 4ca8ce3447bead26b9dae12da3076d76ecc181c3
Merge: f742bdd 0a70a15
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Oct 4 15:04:19 2011 +0800

    Merge branch 'master' into msvc-support

 cogl-pango/Makefile.am                    |    1 -
 cogl/Makefile.am                          |    2 -
 cogl/winsys/cogl-winsys-glx.c             |   34 ++++++--
 configure.ac                              |   35 +++++++
 examples/Makefile.am                      |    5 -
 po/bg.po                                  |   35 +++++++
 po/ca valencia po                         |   35 +++++++
 po/vi.po                                  |   34 +++++++
 tests/conform/Makefile.am                 |    5 +-
 tests/conform/test-color-mask.c           |    9 ++
 tests/conform/test-conform-main.c         |    4 +-
 tests/conform/test-depth-test.c           |   21 +---
 tests/conform/test-just-vertex-shader.c   |  143 +++++++++++++++++++++--------
 tests/conform/test-pipeline-user-matrix.c |  122 ++++++++++++-------------
 14 files changed, 347 insertions(+), 138 deletions(-)
---