diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-05-24 10:42:03 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-05-24 10:42:03 +0100 |
| commit | 382bd394b92cd0abcc7cfbfae31dccf162aea7e8 (patch) | |
| tree | b15b1c92b729643b862cf700fad0e940e292efe1 /.gitignore | |
| parent | 254e8d0fe585bb7de0798dd8063470d2aa1c60a5 (diff) | |
| parent | 9fcbb274e01e4fb5df2d08fddfdfd3b91fe63e4e (diff) | |
| download | clutter-382bd394b92cd0abcc7cfbfae31dccf162aea7e8.tar.gz | |
Merge branch 'wip/state-machine'
* wip/state-machine:
Do not use wildcards in test-state
script: Implement State deserialization
state: added a "target-state" property
state: documented data structures
Add State interactive tests to the ignore file
state: Documentation and introspection annotation fixes
state: Minor coding style fixes
state: Clean up the header's documentation
state: Constify StateKey accessors
Do not include clutter.h from a Clutter header file
state-machine: made clutter_state_change take a boolean animate argument
state-machine: use clutter_timeline_get_progress
state-machine: add completed signal
state machine: added state machine
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9381cacfe..788783dbc 100644 --- a/.gitignore +++ b/.gitignore @@ -151,6 +151,8 @@ TAGS /tests/interactive/test-stage-sizing /tests/interactive/test-drag /tests/interactive/test-constraints +/tests/interactive/test-state +/tests/interactive/test-state-animator /tests/conform/stamp-test-conformance /tests/conform/test-anchors /tests/conform/test-cogl-backface-culling @@ -258,6 +260,7 @@ TAGS /tests/conform/test-cogl-path /tests/conform/test-cogl-wrap-modes /tests/conform/test-clutter-cairo-texture +/tests/conform/test-state-base /tests/conform/wrappers /tests/micro-bench/test-text-perf /tests/micro-bench/test-text |