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

..

clutter

[docs] Documentation warnings

2009-01-09 14:26:35 +00:00

cogl

Merge commit 'origin/master' into cogl-material

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

ChangeLog

2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com>

2008-12-08 14:22:39 +00:00

Makefile.am

…