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

..

cogl

Merge remote branch 'master' into texture-debugging

2010-02-01 13:37:19 +00:00

pango

[cogl] move clutter/pango to clutter/cogl/pango

2009-10-16 18:58:51 +01:00

Makefile.am

[cogl] move clutter/pango to clutter/cogl/pango

2009-10-16 18:58:51 +01:00