Emmanuele Bassi f8f54989be Merge commit 'origin/master' into 1.0-integration ...

Conflicts:
	clutter/clutter-texture.c
	clutter/cogl/gl/cogl-fbo.c

2009-05-20 16:49:22 +01:00

..

clutter-backend-x11-private.h

…

clutter-backend-x11.c

Merge commit 'origin/master' into 1.0-integration

2009-05-20 16:49:22 +01:00

clutter-backend-x11.h

[x11] Abstract XVisualInfo creation

2009-05-13 21:49:45 +01:00

clutter-event-x11.c

…

clutter-stage-x11.c

[x11] Abstract XVisualInfo creation

2009-05-13 21:49:45 +01:00

clutter-stage-x11.h

…

clutter-x11-enum-types.c.in

…

clutter-x11-enum-types.h.in

…

clutter-x11-texture-pixmap.c

…

clutter-x11-texture-pixmap.h

…

clutter-x11.h

…

clutter-x11.pc.in

…

Makefile.am

…