Robert Bragg a0c5690d55 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

..

reference/cogl

Merge commit 'origin/master' into cogl-material

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