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

..

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

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

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

cogl-fbo.h

Bug 945 - Clipping+fbo cloning bugs

2008-08-01 12:23:57 +00:00

cogl-internal.h

A comparison of gl/cogl-texture.c and gles/cogl-texture.c, to reduce

2008-11-18 16:24:09 +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

Removed COGLhandle and changed shader and program functions to be

2008-04-29 16:10:37 +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

Adds a CoglMaterial abstraction, which includes support for multi-texturing

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

cogl-texture.c

Merge commit 'origin/master' into cogl-material

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

cogl.c

Fix computation of camera distance

2009-01-22 14:17:16 +00:00

Makefile.am

Merge commit 'origin/master' into cogl-material

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