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-glx.c	[backend] Abstract the GL context creation	2009-05-13 22:21:48 +01:00
clutter-backend-glx.h	2008-04-15 Matthew Allum <mallum@openedhand.com>	2008-04-15 21:18:13 +00:00
clutter-glx-texture-pixmap.c	[cogl] Remove the COGL{enum,int,uint} typedefs	2009-05-12 14:53:44 +01:00
clutter-glx-texture-pixmap.h	2008-06-30 Matthew Allum <mallum@openedhand.com>	2008-06-30 14:36:49 +00:00
clutter-glx.h	2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-30 17:04:34 +00:00
clutter-stage-glx.c	[backend] Abstract the GL context creation	2009-05-13 22:21:48 +01:00
clutter-stage-glx.h	2008-03-28 Matthew Allum <mallum@openedhand.com>	2008-03-28 22:50:55 +00:00
Makefile.am	Use $(MAINTAINER_CFLAGS) in clutter/{x11,glx}/Makefile.am	2009-04-17 14:53:24 +01:00