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

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

commit da256ec45a148d188a24bbd86f1045d42388eeee
Merge: 7671829 dc8f564
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Nov 7 11:26:54 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/cogl-clip-state.c            |   16 +--
 cogl/cogl-context.c               |    4 +-
 cogl/cogl-program.c               |    1 +
 cogl/cogl-texture-2d.c            |    7 +-
 cogl/winsys/cogl-winsys-egl.c     |   99 ++++--------
 cogl/winsys/cogl-winsys-glx.c     |    2 -
 po/es.po                          |   44 +++---
 po/gl.po                          |  321 +++++++++++++++++++++++++++++++++++-
 tests/conform/Makefile.am         |    2 +-
 tests/conform/test-conform-main.c |    2 +-
 tests/conform/test-path.c         |   99 ++++-------
 11 files changed, 416 insertions(+), 181 deletions(-)
---