[clutter/msvc-support: 64/64] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 64/64] Merge branch 'master' into msvc-support
- Date: Wed, 15 Jun 2011 07:34:53 +0000 (UTC)
commit d2f013767a8f2ccaa248a9a304a1c3d587183325
Merge: 2c32ce1 2d8083b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jun 15 15:49:42 2011 +0800
Merge branch 'master' into msvc-support
NEWS | 97 +
README.in | 27 +
build/autotools/Makefile.am.changelog | 38 +-
build/autotools/Makefile.am.release | 8 +-
build/clutter.modules | 21 +-
clutter/Makefile.am | 91 +-
clutter/cally/cally-actor.c | 18 +-
clutter/cally/cally-text.c | 6 +-
clutter/cally/cally-util.c | 8 +-
clutter/clutter-actor-meta-private.h | 39 +-
clutter/clutter-actor-meta.c | 4 +-
clutter/clutter-actor-meta.h | 16 +-
clutter/clutter-actor-private.h | 8 +-
clutter/clutter-actor.c | 222 ++-
clutter/clutter-actor.h | 4 +-
clutter/clutter-animator.c | 2 +-
clutter/clutter-animator.h | 16 +-
clutter/clutter-backend.c | 40 +-
clutter/clutter-backend.h | 2 +-
clutter/clutter-binding-pool.c | 2 +-
clutter/clutter-binding-pool.h | 2 +-
clutter/clutter-box-layout.c | 512 ++++--
clutter/clutter-click-action.c | 362 ++++-
clutter/clutter-click-action.h | 32 +-
clutter/clutter-color.c | 4 +-
clutter/clutter-color.h | 8 +-
clutter/clutter-effect-private.h | 14 +-
clutter/clutter-effect.c | 61 +-
clutter/clutter-effect.h | 36 +-
clutter/clutter-event.c | 2 +-
clutter/clutter-event.h | 5 +-
clutter/clutter-fixed.c | 4 +-
clutter/clutter-gesture-action.c | 475 +++++
clutter/clutter-gesture-action.h | 120 ++
clutter/clutter-input-device.c | 2 +-
clutter/clutter-input-device.h | 2 +-
clutter/clutter-interval.c | 2 +-
clutter/clutter-interval.h | 2 +-
clutter/clutter-marshal.list | 4 +-
clutter/clutter-model.c | 2 +-
clutter/clutter-model.h | 2 +-
clutter/clutter-offscreen-effect.c | 12 +-
clutter/clutter-private.h | 2 +-
clutter/clutter-script-parser.c | 115 +-
clutter/clutter-script-private.h | 5 +
clutter/clutter-script.c | 260 +++-
clutter/clutter-script.h | 83 +-
clutter/clutter-scriptable.c | 2 +-
clutter/clutter-scriptable.h | 2 +-
clutter/clutter-settings.c | 32 +
clutter/clutter-shader-effect.c | 41 +-
clutter/clutter-shader-effect.h | 30 +-
clutter/clutter-shader-types.c | 6 +-
clutter/clutter-shader-types.h | 31 +-
clutter/clutter-shader.c | 50 +-
clutter/clutter-shader.h | 21 +-
clutter/clutter-stage.c | 17 +-
clutter/clutter-stage.h | 2 +-
clutter/clutter-state.c | 8 +-
clutter/clutter-state.h | 8 +-
clutter/clutter-swipe-action.c | 221 ++
clutter/clutter-swipe-action.h | 120 ++
clutter/clutter-text.c | 414 +++-
clutter/clutter-text.h | 8 +-
clutter/clutter-types.h | 25 +-
clutter/clutter-units.c | 2 +-
clutter/clutter-units.h | 6 +-
clutter/clutter-util.c | 2 +-
clutter/clutter.h | 2 +
.../clutter-backend-cogl.c} | 172 +-
.../clutter-backend-cogl.h} | 39 +-
clutter/{egl => cogl}/clutter-cex100.h.in | 0
clutter/{egl => cogl}/clutter-egl.h | 0
clutter/{egl => cogl}/clutter-event-tslib.c | 2 +-
clutter/{glx => cogl}/clutter-glx-texture-pixmap.c | 4 +-
clutter/{glx => cogl}/clutter-glx-texture-pixmap.h | 4 +-
.../clutter-stage-cogl.c} | 336 ++--
clutter/cogl/clutter-stage-cogl.h | 78 +
clutter/egl/clutter-egl-headers.h | 46 -
clutter/egl/clutter-stage-egl.h | 75 -
clutter/glx/clutter-backend-glx.c | 374 ----
clutter/glx/clutter-backend-glx.h | 80 -
clutter/glx/clutter-glx.h | 46 -
clutter/glx/clutter-stage-glx.c | 541 -----
clutter/glx/clutter-stage-glx.h | 77 -
clutter/osx/clutter-event-osx.c | 85 +-
clutter/win32/clutter-backend-win32.c | 2 +-
clutter/win32/clutter-backend-win32.h | 2 +-
clutter/x11/clutter-backend-x11.c | 2 +-
clutter/x11/clutter-x11.h | 2 +-
configure.ac | 47 +-
AUTHORS => doc/AUTHORS.old | 0
doc/CODING_STYLE | 8 +-
doc/RELEASING | 9 +-
doc/cookbook/examples/cb-button.c | 2 +-
doc/cookbook/examples/cb-button.h | 2 +-
doc/reference/clutter/Makefile.am | 1 +
doc/reference/clutter/clutter-docs.xml.in | 7 +
doc/reference/clutter/clutter-sections.txt | 49 +
doc/reference/clutter/clutter.types | 2 +
po/clutter-1.0.pot | 1109 ++++++-----
po/cs.po | 1124 +++++------
po/de.po | 1146 ++++++-----
po/eo.po | 1102 +++++-----
po/es.po | 1109 +++++-----
po/fr.po | 703 ++++----
po/gl.po | 1113 ++++++-----
po/id.po | 726 ++++----
po/it.po | 730 ++++----
po/nb.po | 2129 ++++++++++++++++++++
po/nl.po | 731 ++++----
po/pa.po | 698 ++++----
po/pl.po | 723 ++++----
po/sl.po | 1242 ++++++------
po/sv.po | 708 ++++----
po/te.po | 703 ++++----
po/uk.po | 731 ++++----
po/zh_CN.po | 729 ++++----
po/zh_TW.po | 731 ++++----
tests/conform/test-path.c | 2 +-
tests/conform/test-pick.c | 200 ++-
tests/data/Makefile.am | 3 +-
tests/data/test-script-signals.json | 68 +
tests/interactive/Makefile.am | 4 +-
tests/interactive/test-bin-layout.c | 31 +-
tests/interactive/test-constraints.c | 42 +-
tests/interactive/test-flow-layout.c | 2 +-
tests/interactive/test-shader.c | 2 +
tests/interactive/test-state-script.c | 54 +
tests/interactive/test-swipe-action.c | 187 ++
130 files changed, 14613 insertions(+), 9912 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
