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

..

Makefile.am

Merge commit 'origin/master' into cogl-material

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

test-actors.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-animation.c

Animate ClutterColor properties

2009-01-06 12:53:30 +00:00

test-behave.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-binding-pool.c

2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com>

2008-12-08 13:57:10 +00:00

test-clip.c

[tests] Update the tests calling cogl_texture_new_*

2009-01-21 10:14:29 +00:00

test-clutter-cairo-flowers.c

[tests] Adds a flowery clutter_cairo_texture unit test

2009-01-14 15:25:27 +00:00

test-cogl-material.c

[test-cogl-material] Remove return value from material_rectangle_paint

2009-01-06 16:01:23 +00:00

test-cogl-offscreen.c

[tests] Update the tests calling cogl_texture_new_*

2009-01-21 10:14:29 +00:00

test-cogl-primitives.c

…

test-cogl-tex-convert.c

[tests] Update the tests calling cogl_texture_new_*

2009-01-21 10:14:29 +00:00

test-cogl-tex-foreign.c

…

test-cogl-tex-getset.c

[tests] Update the tests calling cogl_texture_new_*

2009-01-21 10:14:29 +00:00

test-cogl-tex-polygon.c

[tests] Update the tests calling cogl_texture_new_*

2009-01-21 10:14:29 +00:00

test-cogl-tex-tile.c

[tests] Update the tests calling cogl_texture_new_*

2009-01-21 10:14:29 +00:00

test-depth.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-devices.c

…

test-easing.c

Update the interactive tests to ClutterText

2008-12-11 13:48:01 +00:00

test-entry.c

…

test-events.c

…

test-fbo.c

Update the interactive tests to ClutterText

2008-12-11 13:48:01 +00:00

test-fullscreen.c

…

test-grab.c

…

test-layout.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-main.c

…

test-model.c

…

test-multistage.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-offscreen.c

…

test-paint-wrapper.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-perspective.c

…

test-pixmap.c

…

test-project.c

Fix last improper usage of ClutterUnits

2009-01-08 16:00:47 +00:00

test-random-text.c

Update the interactive tests to ClutterText

2008-12-11 13:48:01 +00:00

test-rotate.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-scale.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-score.c

…

test-script.c

…

test-shader.c

Update the interactive tests to ClutterText

2008-12-11 13:48:01 +00:00

test-stage-read-pixels.c

Update the interactive tests to ClutterText

2008-12-11 13:48:01 +00:00

test-text-field.c

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

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

test-text.c

[tests] Update the ClutterText interactive test

2009-01-07 15:54:08 +00:00

test-texture-quality.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-textures.c

…

test-threads.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

test-unproject.c

Merge the ClutterText actor

2009-01-07 12:06:33 +00:00

test-viewport.c

[alpha] Allow registering alpha functions

2009-01-16 14:37:35 +00:00

wrapper.sh

…