[clutter/msvc-support: 17/17] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 17/17] Merge branch 'master' into msvc-support
- Date: Fri, 9 Sep 2011 02:38:24 +0000 (UTC)
commit f54114087359a6433f7813ad123fd4b1a041f7b4
Merge: c022102 909e116
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Sep 9 10:38:07 2011 +0800
Merge branch 'master' into msvc-support
build/autotools/Makefile.am.release | 36 +-
build/mingw/mingw-fetch-dependencies.sh | 10 +-
clutter/clutter-actor.c | 6 +-
clutter/clutter-alpha.c | 2 +-
clutter/clutter-animation.c | 2 +-
clutter/clutter-animator.c | 18 +-
clutter/clutter-model.c | 12 +-
clutter/clutter-script-parser.c | 114 +-
clutter/clutter-script-private.h | 54 +-
clutter/clutter-script.c | 2 +-
clutter/clutter-state.c | 12 +-
clutter/clutter-text.c | 185 ++-
po/en_GB.po | 2185 ++++++++++++++++++++++++++++++
po/id.po | 1673 ++++++++++++------------
po/lv.po | 2193 ++++++++++++++++++++++++++++++
po/or.po | 2169 ++++++++++++++++++++++++++++++
po/pl.po | 62 +-
po/pt_BR.po | 2215 +++++++++++++++++++++++++++++++
tests/conform/test-clutter-text.c | 92 ++
tests/conform/test-conform-main.c | 1 +
20 files changed, 9952 insertions(+), 1091 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]