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

..

Makefile.am

Merge commit 'origin/master' into cogl-material

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

test-actors.c

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

2008-11-18 09:50:03 +00:00

test-animation.c

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

2008-11-20 10:52:09 +00:00

test-behave.c

Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline

2008-12-05 13:13:37 +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

[test-clip] Use gint for hand_{width,height} when calulating -hand_* /2

2009-01-08 11:38:31 +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

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

2008-11-12 13:57:58 +00:00

test-cogl-primitives.c

Bug 1172 - Disjoint paths and clip to path

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

test-cogl-tex-convert.c

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

2008-11-12 13:57:58 +00:00

test-cogl-tex-foreign.c

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

2008-11-12 13:57:58 +00:00

test-cogl-tex-getset.c

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

2008-11-12 13:57:58 +00:00

test-cogl-tex-polygon.c

Update the interactive tests to ClutterText

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

test-cogl-tex-tile.c

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

2008-11-12 13:57:58 +00:00

test-depth.c

[test-depth] Use a gint for width, not guint, when calculating -width/2

2009-01-08 11:03:23 +00:00

test-devices.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-easing.c

Update the interactive tests to ClutterText

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

test-effects.c

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

2008-11-18 09:50:03 +00:00

test-entry.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-events.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-fbo.c

Update the interactive tests to ClutterText

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

test-fullscreen.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-grab.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-layout.c

Merge the ClutterText actor

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

test-main.c

* tests/interactive/test-main.c (main): Allow more than two

2008-11-10 16:30:42 +00:00

test-model.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-multistage.c

Update the interactive tests to ClutterText

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

test-offscreen.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-paint-wrapper.c

[test-paint-wrapper] Use a separate paint guard for each actor

2008-12-15 16:33:45 +00:00

test-perspective.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-pixmap.c

Fixed some trivial compiler warnings

2008-11-18 18:53:10 +00:00

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

Update the interactive tests to ClutterText

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

test-scale.c

[tests] Make test-scale use ClutterText

2009-01-07 12:17:09 +00:00

test-score.c

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

2008-11-14 14:52:35 +00:00

test-script.c

Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline

2008-12-05 13:13:37 +00:00

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

[tests] Add text field interactive test

2009-01-07 00:27:50 +00:00

test-text.c

[tests] Update the ClutterText interactive test

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

test-texture-quality.c

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

2008-11-18 09:50:03 +00:00

test-textures.c

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00

test-threads.c

Move test-threads to ClutterText

2008-12-11 11:37:46 +00:00

test-unproject.c

Merge the ClutterText actor

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

test-viewport.c

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

2008-11-18 09:50:03 +00:00

wrapper.sh

Bug 1162 - Re-works the tests/ to use the glib-2.16 unit testing

2008-11-07 19:32:28 +00:00