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
..
2008-12-23 20:55:35 +00:00
2008-10-31 12:07:01 +00:00
2009-01-07 12:06:33 +00:00
2009-01-07 12:06:33 +00:00