Emmanuele Bassi f8f54989be Merge commit 'origin/master' into 1.0-integration ...

Conflicts:
	clutter/clutter-texture.c
	clutter/cogl/gl/cogl-fbo.c

2009-05-20 16:49:22 +01:00

..

Makefile.am

…

test-actor-clone.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-actors.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-animation.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-behave.c

…

test-binding-pool.c

…

test-clip.c

…

test-clutter-cairo-flowers.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-cogl-multitexture.c

…

test-cogl-offscreen.c

[cogl-offscreen] Cleans up the cogl offscreen API and adds documentation

2009-05-02 04:12:26 +01:00

test-cogl-primitives.c

…

test-cogl-tex-convert.c

…

test-cogl-tex-foreign.c

…

test-cogl-tex-getset.c

…

test-cogl-tex-polygon.c

[cogl] Remove the COGL{enum,int,uint} typedefs

2009-05-12 14:53:44 +01:00

test-cogl-tex-tile.c

[cogl] Remove the COGL{enum,int,uint} typedefs

2009-05-12 14:53:44 +01:00

test-cogl-vertex-buffer.c

…

test-depth.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-devices.c

…

test-easing.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-entry.c

…

test-events.c

…

test-fbo.c

…

test-fullscreen.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-grab.c

…

test-layout.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-main.c

…

test-model.c

…

test-multistage.c

…

test-offscreen.c

…

test-paint-wrapper.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-perspective.c

…

test-pixmap.c

…

test-project.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-random-text.c

…

test-rotate.c

…

test-scale.c

…

test-score.c

…

test-script.c

…

test-shader.c

…

test-stage-read-pixels.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-text-field.c

Merge commit 'origin/master' into 1.0-integration

2009-05-20 16:49:22 +01:00

test-text.c

…

test-texture-async.c

…

test-texture-quality.c

…

test-textures.c

…

test-threads.c

…

test-unproject.c

Remove Units from the public API

2009-05-06 16:44:47 +01:00

test-viewport.c

…

wrapper.sh

…