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

..

cogl-context.c

Merge commit 'origin/master' into cogl-material

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

cogl-context.h

Merge commit 'origin/master' into cogl-material

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

cogl-defines.h.in

[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2

2008-12-22 16:35:51 +00:00

cogl-fbo.c

…

cogl-fbo.h

…

cogl-fixed-fragment-shader.glsl

[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2

2008-12-22 16:35:51 +00:00

cogl-fixed-vertex-shader.glsl

[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2

2008-12-22 16:35:51 +00:00

cogl-gles2-wrapper.c

[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2

2008-12-22 16:35:51 +00:00

cogl-gles2-wrapper.h

[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2

2008-12-22 16:35:51 +00:00

cogl-internal.h

…

cogl-primitives.c

Bug 1172 - Disjoint paths and clip to path

2008-12-04 13:45:09 +00:00

cogl-program.c

…

cogl-program.h

…

cogl-shader-private.h

…

cogl-shader.c

…

cogl-texture-private.h

[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2

2008-12-22 16:35:51 +00:00

cogl-texture.c

Merge commit 'origin/master' into cogl-material

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

cogl-util.c

…

cogl-util.h

…

cogl.c

Bug 1172 - Disjoint paths and clip to path

2008-12-04 13:45:09 +00:00

Makefile.am

Merge commit 'origin/master' into cogl-material

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

stringify.sh

…