[clutter: 11/11] Merge branch 'stage-state'

[Emmanuele Bassi <ebassi src gnome org>]

commit fdf89a9e06859f38453196f97e7b5ea692113729
Merge: 9206bd7 9dab334
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Jan 26 08:42:00 2012 +0000

    Merge branch 'stage-state'
    
    * stage-state:
      docs: Update ClutterStageState flags
      wayland: Use the Stage state tracking
      gdk: Use the Stage state tracking
      win32: Use the Stage state tracking
      x11: Use the Stage state tracking
      osx: Use the Stage state tracking
      stage: Add state tracking

 clutter/clutter-enums.h                        |   10 +-
 clutter/clutter-stage-private.h                |    7 ++
 clutter/clutter-stage.c                        |  121 ++++++++++++++++++++----
 clutter/gdk/clutter-event-gdk.c                |   32 ++----
 clutter/osx/clutter-stage-osx.c                |   60 +++++-------
 clutter/osx/clutter-stage-osx.h                |    2 -
 clutter/wayland/clutter-input-device-wayland.c |   21 +---
 clutter/win32/clutter-event-win32.c            |   28 ++----
 clutter/win32/clutter-stage-win32.c            |   31 +++---
 clutter/win32/clutter-stage-win32.h            |    1 -
 clutter/x11/clutter-stage-x11.c                |   72 +++++---------
 clutter/x11/clutter-stage-x11.h                |    2 -
 12 files changed, 206 insertions(+), 181 deletions(-)
---