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

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [cogl/msvc-support: 6/6] Merge branch 'master' into msvc-support
Date: Wed, 26 Oct 2011 04:40:09 +0000 (UTC)

commit 344613ab1cfe4862efcffe27f34a3d961625da77
Merge: 28639b5 49e733f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Oct 26 12:57:56 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/cogl-pipeline-fragend-arbfp.c |   18 ++-
 cogl/cogl-pipeline-progend-glsl.c  |   18 ++-
 cogl/cogl-shader.h                 |  234 ++++++++++++++++++++++--
 po/es.po                           |  314 ++++++++++++++++++++++++++++++-
 po/he.po                           |  329 ++++++++++++++++++++++++++++++++-
 po/sl.po                           |  360 +++++++++++++++++++++++++++++++++++-
 6 files changed, 1228 insertions(+), 45 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]