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

[Chun-wei Fan <fanchunwei src gnome org>]

commit 0a182a25d68949572c923dc131dbc53785a4fbf6
Merge: 14e96ce e03fb1e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Aug 31 20:47:00 2011 +0800

    Merge branch 'master' into msvc-support

 doc/cookbook/clutter-cookbook.xml.in     |    2 +-
 doc/cookbook/examples/Makefile.am        |   23 ++++--
 doc/cookbook/examples/script-signals.c   |    5 +-
 doc/cookbook/examples/script-states.c    |   44 ++++++++++
 doc/cookbook/examples/script-states.json |   92 +++++++++++++++++++++
 doc/cookbook/script.xml                  |  127 ++++++++++++++++++++++++++++++
 tests/data/test-script-signals.json      |    2 +-
 7 files changed, 286 insertions(+), 9 deletions(-)
---