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

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

commit a9bcf7387582ed2d6e77ae303a1546994e9c9f04
Merge: 925a824 2528ad8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jun 23 16:01:14 2011 +0800

    Merge branch 'master' into msvc-support

 clutter/clutter-behaviour.c                   |   11 +++++++----
 clutter/clutter-drag-action.c                 |    6 ++++++
 clutter/cogl/clutter-glx-texture-pixmap.c     |    4 +++-
 clutter/cogl/clutter-glx.h                    |   10 ----------
 doc/reference/clutter/Makefile.am             |    1 -
 doc/reference/clutter/clutter-docs.xml.in     |    1 -
 doc/reference/clutter/clutter-sections.txt    |    5 -----
 doc/reference/clutter/constraints-example.png |  Bin 5985 -> 6199 bytes
 8 files changed, 16 insertions(+), 22 deletions(-)
---