Robert Bragg 3d07e34cc5 Merge commit 'origin/master' into cogl-material ...

Conflicts:

	clutter/clutter-texture.c
	clutter/cogl/cogl-texture.h
	clutter/cogl/cogl.h.in
	clutter/cogl/common/Makefile.am
	clutter/cogl/gl/Makefile.am
	clutter/cogl/gles/Makefile.am
	clutter/cogl/gles/cogl-gles2-wrapper.c
	clutter/cogl/gles/cogl-gles2-wrapper.h

2009-01-23 15:23:49 +00:00

..

cogl-docs.sgml

Merge commit 'origin/master' into cogl-material

2009-01-23 15:23:49 +00:00

cogl-sections.txt

Merge commit 'origin/master' into cogl-material

2009-01-23 15:23:49 +00:00

Makefile.am

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

2008-10-30 17:25:00 +00:00

version.xml.in

2008-07-30 Ross Burton <ross@openedhand.com>

2008-07-30 09:17:57 +00:00