[cogl/msvc-support: 12/12] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support: 12/12] Merge branch 'master' into msvc-support
- Date: Mon, 4 Jul 2011 01:32:02 +0000 (UTC)
commit af7065dd5fb09d6d21f674df734a3a5c58a4e4ce
Merge: 90c6ea3 19c2358
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jul 4 09:31:46 2011 +0800
Merge branch 'master' into msvc-support
NEWS | 40 ++
README.in | 2 +-
build/autotools/Makefile.am.release | 45 +-
cogl/Makefile.am | 1 +
cogl/cogl-pipeline-private.h | 27 +-
cogl/cogl-pipeline.c | 44 +--
cogl/cogl-queue.h | 647 ++++++++++++++++++++++++
cogl/driver/gles/cogl-feature-functions-gles.h | 4 +-
configure.ac | 32 +-
po/ja.po | 34 ++
10 files changed, 797 insertions(+), 79 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]