[cogl/msvc-support-1.8: 3/3] Merge branch 'cogl-1.8' into msvc-support-1.8

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

commit 22e5bf9f2a0e3aa77ea74ce51f2d1735705fbc35
Merge: 1eecde2 b76fb45
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Oct 26 12:57:36 2011 +0800

    Merge branch 'cogl-1.8' into msvc-support-1.8

 cogl/cogl-pipeline-fragend-arbfp.c |   18 +++++++++++++-----
 cogl/cogl-pipeline-progend-glsl.c  |   18 +++++++++++++-----
 po/te.po                           |    1 -
 3 files changed, 26 insertions(+), 11 deletions(-)
---

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