[clutter/msvc-support: 15/15] Merge branch 'master' into msvc-support



commit ca958135d3581d8f44130bb6da8433882d17b42f
Merge: 191dc02 91ace65
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Aug 1 12:01:37 2011 +0800

    Merge branch 'master' into msvc-support

 clutter/clutter-actor.c                    |   20 +-
 clutter/clutter-actor.h                    |    2 +-
 clutter/clutter-animatable.c               |   87 ++-
 clutter/clutter-animatable.h               |   16 +-
 clutter/clutter-animation.c                |   14 +-
 clutter/clutter-behaviour-path.c           |    2 +-
 clutter/clutter-behaviour-rotate.c         |    4 +-
 clutter/clutter-behaviour.h                |    2 +-
 clutter/clutter-container.c                |    6 +-
 clutter/clutter-model.c                    |  145 ++---
 clutter/clutter-path.h                     |    2 +-
 clutter/clutter-script.c                   |    3 +-
 clutter/clutter-stage.c                    |    7 +-
 clutter/clutter-state.c                    |   87 ++-
 clutter/clutter-text.c                     |    4 +-
 clutter/osx/clutter-stage-osx.c            |   75 ++-
 clutter/osx/clutter-stage-osx.h            |    4 +-
 doc/reference/clutter/clutter-sections.txt |    1 +
 po/cs.po                                   | 1116 ++++++++++++++--------------
 tests/conform/test-conform-main.c          |    1 +
 tests/conform/test-model.c                 |   95 +++
 tests/interactive/test-state.c             |    4 +
 22 files changed, 967 insertions(+), 730 deletions(-)
---



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