Neil Roberts efcbd20320 Merge remote branch 'master' into texture-debugging ... Conflicts: clutter/cogl/cogl/cogl-context.h		2010-02-01 13:37:19 +00:00
..
blend-strings.xml	cogl: Fix gl equivalent of blend string	2010-01-26 17:25:25 +00:00
cogl-docs.xml.in	docs: Add indices to the Cogl API reference	2009-11-19 14:30:01 +00:00
cogl-sections.txt	cogl: Add a sub texture backend	2009-12-02 22:03:08 +00:00
Makefile.am	docs: Fix Cogl API reference build	2009-11-19 13:56:42 +00:00