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

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

commit a52bc8f0cacae3f7ce235e9e4c8f4d89d61538e4
Merge: 59f6f12 b191067
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 20 10:45:42 2011 +0800

    Merge branch 'master' into msvc-support
    
    Conflicts:
    	po/nb.po
    	po/sl.po

 clutter/clutter-actor.c                            |   12 +-
 clutter/clutter-alpha.c                            |   66 +-
 clutter/clutter-main.c                             |    2 +-
 clutter/clutter-snap-constraint.c                  |    4 +-
 clutter/clutter-text.c                             |    2 +-
 clutter/clutter-texture.c                          |  130 +--
 clutter/clutter-timeline.c                         |    6 +-
 clutter/cogl/clutter-egl-headers.h                 |   22 +-
 ...r-actor-invariants.txt => actor-invariants.txt} |    0
 doc/size-negotiation.txt                           |   98 ++
 po/nb.po                                           | 1288 ++++++++++----------
 po/sl.po                                           | 1246 ++++++++++---------
 tests/conform/test-cogl-materials.c                |   12 +-
 tests/conform/test-cogl-texture-rectangle.c        |   58 +-
 tests/conform/test-conform-common.c                |   24 +
 tests/conform/test-conform-common.h                |   19 +
 tests/interactive/test-cogl-tex-foreign.c          |   49 +-
 17 files changed, 1631 insertions(+), 1407 deletions(-)
---