[clutter/msvc-support: 7/7] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 7/7] Merge branch 'master' into msvc-support
- Date: Tue, 23 Aug 2011 02:23:13 +0000 (UTC)
commit b9edba08ed337aea862d084ea4a5569633d67877
Merge: b11d086 a661191
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Aug 23 10:22:59 2011 +0800
Merge branch 'master' into msvc-support
clutter/clutter-settings.c | 67 ++-
clutter/x11/clutter-settings-x11.h | 3 +-
configure.ac | 15 +-
doc/cookbook/actors.xml | 8 +-
po/es.po | 1112 ++++++++++++++++++------------------
5 files changed, 652 insertions(+), 553 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]