Merge branch 'wip/state-machine'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 24 May 2010 09:42:03 +0000 (10:42 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 24 May 2010 09:42:03 +0000 (10:42 +0100)
commit382bd394b92cd0abcc7cfbfae31dccf162aea7e8
treeb15b1c92b729643b862cf700fad0e940e292efe1
parent254e8d0fe585bb7de0798dd8063470d2aa1c60a5
parent9fcbb274e01e4fb5df2d08fddfdfd3b91fe63e4e
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
.gitignore
clutter/Makefile.am
clutter/clutter.h
tests/interactive/Makefile.am