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

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

commit d3a9bf201b42f156d4743b8a194d0e03f41ff7ef
Merge: 39c3ccf bf9339b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Nov 16 09:15:16 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/clutter-debug.h           |   32 +---
 clutter/clutter-deform-effect.c   |  334 ++++++++++++++++++++-----------------
 clutter/clutter-main.c            |   93 +++++++----
 clutter/clutter-main.h            |    3 -
 clutter/clutter-private.h         |    5 +-
 clutter/clutter-profile.c         |   10 +-
 clutter/clutter-profile.h         |   41 ++---
 clutter/clutter-stage.c           |   16 +-
 clutter/clutter-texture.c         |    7 +-
 clutter/clutter-timeline.c        |    6 +-
 clutter/deprecated/clutter-main.h |    9 +
 11 files changed, 299 insertions(+), 257 deletions(-)
---