Robert Bragg 3d07e34cc5 Merge commit 'origin/master' into cogl-material ...

Conflicts:

	clutter/clutter-texture.c
	clutter/cogl/cogl-texture.h
	clutter/cogl/cogl.h.in
	clutter/cogl/common/Makefile.am
	clutter/cogl/gl/Makefile.am
	clutter/cogl/gles/Makefile.am
	clutter/cogl/gles/cogl-gles2-wrapper.c
	clutter/cogl/gles/cogl-gles2-wrapper.h

2009-01-23 15:23:49 +00:00

..

manual

2007-06-16 Emmanuele Bassi <ebassi@openedhand.com>

2007-06-16 09:06:03 +00:00

reference

Merge commit 'origin/master' into cogl-material

2009-01-23 15:23:49 +00:00

clutter-actor-invariants.txt

2008-06-24 Emmanuele Bassi <ebassi@openedhand.com>

2008-06-24 10:42:36 +00:00

Makefile.am

2007-05-31 Matthew Allum <mallum@openedhand.com>

2007-05-30 23:16:58 +00:00