Robert Bragg 616c082a7c Merge commit 'origin/master' into cogl-material ...

Conflicts:

	clutter/clutter-texture.c
	clutter/cogl/cogl-texture.h
	clutter/cogl/gles/cogl-context.c
	clutter/cogl/gles/cogl-context.h

2009-01-13 13:37:38 +00:00

..

cogl-docs.sgml

[doc] Hooks up cogl-material reference documentation

2008-12-22 16:35:52 +00:00

cogl-sections.txt

Merge commit 'origin/master' into cogl-material

2009-01-13 13:37:38 +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