[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: Thu, 28 Jul 2011 03:55:39 +0000 (UTC)
commit 191dc02ce733b347187a7df4c0d0d4299bb9d911
Merge: 8b7aa00 3e7ff36
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Jul 28 12:11:19 2011 +0800
Merge branch 'master' into msvc-support
NEWS | 71 +
README.in | 13 +
clutter/cally/cally-actor.c | 56 +-
clutter/clutter-actor.c | 6 +-
clutter/clutter-animation.c | 6 +-
clutter/clutter-animator.c | 2 +-
clutter/clutter-bin-layout.c | 4 +
clutter/clutter-box.c | 8 +-
clutter/clutter-cairo-texture.c | 617 ++++++--
clutter/clutter-cairo-texture.h | 57 +-
clutter/clutter-container.c | 4 +-
clutter/clutter-interval.c | 6 +-
clutter/clutter-layout-manager.c | 4 +-
clutter/clutter-list-model.c | 2 +-
clutter/clutter-model.c | 10 +-
clutter/clutter-paint-volume.c | 27 +-
clutter/clutter-script.c | 2 +-
clutter/clutter-shader-effect.c | 2 +-
clutter/clutter-state.c | 2 +-
configure.ac | 2 +-
doc/reference/clutter/clutter-sections.txt | 6 +
po/ca.po | 2184 ++++++++++++++++++++++++++++
po/ca valencia po | 2183 +++++++++++++++++++++++++++
po/clutter-1.0.pot | 489 ++++---
po/cs.po | 494 ++++---
po/de.po | 1101 +++++++-------
po/eo.po | 487 ++++---
po/es.po | 31 +-
po/fr.po | 487 ++++---
po/gl.po | 493 ++++---
po/id.po | 487 ++++---
po/it.po | 488 ++++---
po/nb.po | 1097 +++++++-------
po/nl.po | 488 ++++---
po/pa.po | 487 ++++---
po/pl.po | 488 ++++---
po/sl.po | 1233 ++++++++--------
po/sv.po | 487 ++++---
po/te.po | 487 ++++---
po/uk.po | 488 ++++---
po/zh_CN.po | 487 ++++---
po/zh_TW.po | 488 ++++---
tests/conform/Makefile.am | 5 +
tests/conform/test-cally-text.c | 338 +++++
tests/conform/test-clutter-cairo-texture.c | 1 +
tests/conform/test-cogl-materials.c | 2 +
tests/conform/test-conform-main.c | 2 +
tests/interactive/Makefile.am | 1 +
tests/interactive/test-bin-layout.c | 21 +-
tests/interactive/test-cairo-clock.c | 113 ++
tests/interactive/test-cairo-flowers.c | 1 +
tests/interactive/test-easing.c | 60 +-
52 files changed, 11037 insertions(+), 5568 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]