[cogl/msvc-support: 4/4] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support: 4/4] Merge branch 'master' into msvc-support
- Date: Sun, 25 Sep 2011 01:42:20 +0000 (UTC)
commit f742bdd97be09165dc89f84178f5d4c07e8eb39f
Merge: f2c51a5 52d0bd9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Sun Sep 25 09:42:05 2011 +0800
Merge branch 'master' into msvc-support
cogl/cogl-pipeline-fragend-arbfp.c | 10 ++++++++--
po/an.po | 34 ++++++++++++++++++++++++++++++++++
po/ko.po | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 2 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]