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

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

commit 547d841e9935747d3db8a76e14911bd16084d838
Merge: eacdf36 f628839
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Oct 17 15:40:51 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/cogl-debug-options.h                      |  198 ++++++++++++------------
 cogl/cogl-debug.c                              |   11 +-
 cogl/cogl-pipeline.c                           |    2 +
 cogl/cogl-profile.c                            |   12 +-
 cogl/winsys/cogl-texture-pixmap-x11.c          |   22 ++-
 configure.ac                                   |   11 ++
 examples/Makefile.am                           |   49 ++++---
 examples/{crate.c => cogl-crate.c}             |    0
 examples/{hello.c => cogl-hello.c}             |    0
 examples/{x11-foreign.c => cogl-x11-foreign.c} |    0
 examples/{x11-tfp.c => cogl-x11-tfp.c}         |    0
 po/POTFILES.in                                 |    1 +
 po/te.po                                       |   34 ++++
 tests/conform/Makefile.am                      |    2 +-
 tests/conform/test-blend-strings.c             |  192 ++++++++++++-----------
 tests/conform/test-conform-main.c              |    2 +-
 16 files changed, 310 insertions(+), 226 deletions(-)
---