Neil Roberts 145cc9d3df 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

…

cogl-sections.txt

cogl: Add a sub texture backend

2009-12-02 22:03:08 +00:00

Makefile.am

…