Robert Bragg 0c8c273980 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

..

cogl-context.c

Merge commit 'origin/master' into cogl-material

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

cogl-context.h

Merge commit 'origin/master' into cogl-material

2009-01-23 15:23:49 +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

[Automatic fixed-to-float.sh change] Applies all scripted changes

2009-01-20 16:20:54 +00:00

cogl-fbo.h

Bug 1074 - FBOs on GLES

2008-10-29 14:52:48 +00:00

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

Merge commit 'origin/master' into cogl-material

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

cogl-gles2-wrapper.h

Merge commit 'origin/master' into cogl-material

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

cogl-internal.h

* clutter/cogl/gl/cogl-internal.h

2008-11-18 16:23:40 +00:00

cogl-primitives.c

[Automatic fixed-to-float.sh change] Applies a number fixed to float patches

2009-01-20 16:20:54 +00:00

cogl-program.c

2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>

2008-11-18 15:21:02 +00:00

cogl-program.h

* clutter/cogl/gles/cogl-gles2-wrapper.h:

2008-06-24 16:21:40 +00:00

cogl-shader-private.h

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

2008-10-30 17:25:00 +00:00

cogl-shader.c

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

2008-10-30 17:25:00 +00:00

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-23 15:23:49 +00:00

cogl-util.c

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl-util.h

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl.c

[gles] Fix computation of camera distance

2009-01-22 14:52:34 +00:00

Makefile.am

Merge commit 'origin/master' into cogl-material

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

stringify.sh

* clutter/cogl/gles/cogl-gles2-wrapper.h:

2008-06-24 16:21:40 +00:00