Neil Roberts 3b5eb3afeb Merge commit 'git-svn' into multiple-texture-rectangle ...

Conflicts:

	clutter/cogl/gl/cogl-texture.c

2008-12-04 18:20:57 +00:00

..

cogl-context.c

Merge commit 'git-svn' into multiple-texture-rectangle

2008-12-04 18:20:57 +00:00

cogl-context.h

Merge commit 'git-svn' into multiple-texture-rectangle

2008-12-04 18:20:57 +00:00

cogl-defines.h.in

…

cogl-fbo.c

…

cogl-fbo.h

…

cogl-internal.h

…

cogl-primitives.c

…

cogl-program.c

…

cogl-program.h

…

cogl-shader-private.h

…

cogl-shader.c

…

cogl-texture-private.h

…

cogl-texture.c

Merge commit 'git-svn' into multiple-texture-rectangle

2008-12-04 18:20:57 +00:00

cogl.c

…

Makefile.am

…