Merge commit 'origin/master' into 1.0-integration
authorEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 20 May 2009 15:49:22 +0000 (16:49 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 20 May 2009 15:49:22 +0000 (16:49 +0100)
commitf8f54989be460f8ae7abda7c2dc01eb578471742
tree7e983fd0ce81c8be01ab8ba37e6edf7ab74b6fcf
parentaa1246e8917f0977bd03b97c206d4c2a01ff8599
parent4f5a5f38f7068d4ec0dca9967f304a39901e8fec
Merge commit 'origin/master' into 1.0-integration

Conflicts:
clutter/clutter-texture.c
clutter/cogl/gl/cogl-fbo.c
12 files changed:
.gitignore
clutter/Makefile.am
clutter/clutter-cairo-texture.c
clutter/clutter-event.c
clutter/clutter-main.c
clutter/clutter-stage.c
clutter/clutter-text.c
clutter/clutter-texture.c
clutter/x11/clutter-backend-x11.c
doc/reference/clutter/clutter-sections.txt
tests/conform/test-conform-main.c
tests/interactive/test-text-field.c