diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-05-21 10:55:09 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-05-21 10:55:09 +0100 |
| commit | 5e3dc55666c345a6a17dc3ae082c0ee1de3ae82a (patch) | |
| tree | 3623d2798852dbbb1024a92962d872bd02a0916e /clutter/clutter-animator.c | |
| parent | bb2d088cb1c9c1341dc70c4b779bc6ccb57f10e2 (diff) | |
| parent | 65678006a8763361d2b9b00b12a0deee90c1d580 (diff) | |
| download | clutter-5e3dc55666c345a6a17dc3ae082c0ee1de3ae82a.tar.gz | |
Merge branch 'wip/constraints'
* wip/constraints: (24 commits)
Add the Cogl API reference to the fixxref extra directories
Document the internal MetaGroup class
Remove the construct-only flag from ActorMeta:name
doc: Remove gtk-doc annotations from the json-glib copy
doc: Fix parameter documentation
Add named modifiers for Action and Constraint
Remove a redundant animation
Set the stage resizable in test-constraints
Use a 9 grid for the constraints test
Miscellaneous documentation fixes
docs: Document animating action and constraint properties
docs: Document BindConstraint and AlignConstraint
constraint: Rename BindConstraint:bind-axis
constraints: Add AlignConstraint
tests: Add a constraints interactive test
constraint: Add BindConstraint
actor: Implement Animatable
animation: Use the new Animatable API for custom properties
animatable: Add custom properties to Animatable
constraint: Add ClutterConstraint base class
...
Conflicts:
configure.ac
Diffstat (limited to 'clutter/clutter-animator.c')
| -rw-r--r-- | clutter/clutter-animator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clutter/clutter-animator.c b/clutter/clutter-animator.c index 324570802..0c3287ac5 100644 --- a/clutter/clutter-animator.c +++ b/clutter/clutter-animator.c @@ -1150,7 +1150,7 @@ clutter_animator_get_duration (ClutterAnimator *animator) * @first_mode: the id of the alpha function to use * @first_progress: at which stage of the animation this value applies; the * range is a normalized floating point value between 0 and 1 - * @VarArgs: the value first_property_name should have for first_object + * @Varargs: the value first_property_name should have for first_object * at first_progress, followed by more (object, property_name, mode, * progress, value) tuples, followed by %NULL * |