[clutter/msvc-support: 3/3] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 3/3] Merge branch 'master' into msvc-support
- Date: Sun, 14 Aug 2011 15:23:52 +0000 (UTC)
commit d7f05c5b24d695ac004e38459d41eca7aea30bf7
Merge: 449e0a4 d2763fd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Sun Aug 14 23:23:38 2011 +0800
Merge branch 'master' into msvc-support
clutter/cogl/clutter-stage-cogl.c | 4 +---
configure.ac | 2 +-
tests/conform/test-cogl-blend-strings.c | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]