[clutter/msvc-support-2.0: 12/12] Merge branch 'clutter-1.99' into msvc-support-2.0



commit 78d6fc8bad19ac08f3152ff1ae95870b77d65413
Merge: a1a2d54 0891c37
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jun 17 15:07:44 2011 +0800

    Merge branch 'clutter-1.99' into msvc-support-2.0

 clutter/Makefile.am                        |   29 +-
 clutter/clutter-actor.c                    |  415 +------
 clutter/clutter-actor.h                    |   23 -
 clutter/clutter-backend.c                  |  184 ---
 clutter/clutter-backend.h                  |   14 -
 clutter/clutter-behaviour-depth.c          |  301 ----
 clutter/clutter-behaviour-depth.h          |  101 --
 clutter/clutter-behaviour-ellipse.c        | 1061 -------------
 clutter/clutter-behaviour-ellipse.h        |  147 --
 clutter/clutter-behaviour-opacity.c        |  315 ----
 clutter/clutter-behaviour-opacity.h        |  116 --
 clutter/clutter-behaviour-path.c           |  471 ------
 clutter/clutter-behaviour-path.h           |  135 --
 clutter/clutter-behaviour-rotate.c         |  689 ---------
 clutter/clutter-behaviour-rotate.h         |  115 --
 clutter/clutter-behaviour-scale.c          |  435 ------
 clutter/clutter-behaviour-scale.h          |  106 --
 clutter/clutter-behaviour.c                |  702 ---------
 clutter/clutter-behaviour.h                |  166 ---
 clutter/clutter-deprecated.h               |  205 ---
 clutter/clutter-frame-source.c             |  263 ----
 clutter/clutter-frame-source.h             |   51 -
 clutter/clutter-group.h                    |   10 -
 clutter/clutter-keysyms-compat.h           | 2210 ----------------------------
 clutter/clutter-keysyms-update.pl          |   45 +-
 clutter/clutter-keysyms.h                  |    5 -
 clutter/clutter-main.c                     |    5 +-
 clutter/clutter-main.h                     |   11 -
 clutter/clutter-path.c                     |   62 +
 clutter/clutter-script.c                   |    1 -
 clutter/clutter-shader.c                   |  950 ------------
 clutter/clutter-shader.h                   |  149 --
 clutter/clutter-stage-manager.c            |   17 -
 clutter/clutter-stage-manager.h            |    5 -
 clutter/clutter-stage.c                    |    1 -
 clutter/clutter-stage.h                    |   35 -
 clutter/clutter-texture.c                  |   18 -
 clutter/clutter-timeout-interval.c         |  140 --
 clutter/clutter-timeout-interval.h         |   58 -
 clutter/clutter-timeout-pool.c             |  497 -------
 clutter/clutter-timeout-pool.h             |   69 -
 clutter/clutter-types.h                    |    4 -
 clutter/clutter-util.c                     |   29 -
 clutter/clutter-util.h                     |   43 -
 clutter/clutter.h                          |   13 -
 clutter/cogl/clutter-stage-cogl.c          |    1 -
 configure.ac                               |   13 +-
 doc/reference/clutter/clutter-sections.txt |   82 +-
 tests/conform/Makefile.am                  |    1 -
 tests/conform/test-behaviours.c            |   92 --
 tests/conform/test-conform-main.c          |    3 -
 tests/conform/test-script-parser.c         |   39 -
 tests/data/test-script.json                |    6 +-
 tests/interactive/Makefile.am              |   12 +-
 tests/interactive/test-behave.c            |  213 ---
 tests/interactive/test-scale.c             |  117 --
 tests/interactive/test-script.c            |   87 --
 tests/interactive/test-shader.c            |  416 ------
 tests/interactive/test-texture-async.c     |   23 +-
 59 files changed, 112 insertions(+), 11414 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]