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

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

commit 18e71547f8c7df3f5b8d9d71974668d4cc23bda3
Merge: 4a735c9 805d27f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 5 16:17:32 2011 +0800

    Merge branch 'master' into msvc-support

 Makefile.am                                |    5 +-
 NEWS                                       |   62 +++++++++
 build/autotools/Makefile.am.release        |    2 +-
 clutter/Makefile.am                        |    2 +-
 clutter/clutter-group.h                    |    6 +-
 clutter/clutter-media.c                    |    8 +-
 clutter/clutter-stage.h                    |    4 +
 clutter/clutter-text.c                     |   10 +-
 clutter/cogl/clutter-glx-texture-pixmap.c  |    2 -
 configure.ac                               |    3 +-
 po/POTFILES.in                             |    1 +
 tests/Makefile.am                          |    4 +-
 tests/README                               |   18 ++--
 tests/accessibility/Makefile.am            |   90 ++++---------
 tests/conform/test-cogl-materials.c        |    2 +-
 tests/performance/Makefile-retrospect      |   66 ++++++++++
 tests/performance/Makefile-tests           |   15 ++
 tests/performance/Makefile.am              |   42 ++++++
 tests/performance/create-report.rb         |  179 +++++++++++++++++++++++++
 tests/performance/joblist                  |   27 ++++
 tests/performance/makejobs.rb              |   24 ++++
 tests/performance/test-common.h            |  130 +++++++++++++++++++
 tests/performance/test-picking.c           |  133 +++++++++++++++++++
 tests/performance/test-state-hidden.c      |  149 +++++++++++++++++++++
 tests/performance/test-state-interactive.c |  194 ++++++++++++++++++++++++++++
 tests/performance/test-state-mini.c        |  152 ++++++++++++++++++++++
 tests/performance/test-state-pick.c        |  158 ++++++++++++++++++++++
 tests/performance/test-state.c             |  157 ++++++++++++++++++++++
 tests/performance/test-text-perf.c         |  164 +++++++++++++++++++++++
 29 files changed, 1723 insertions(+), 86 deletions(-)
---