Neil Roberts 4e94500a2a Merge branch 'master' into cogl-float ...

The patches have been updated to apply cleanly.

The patches for the g_warnings in clutter-actor.c have been removed
because master now uses CLUTTER_UNITS_FORMAT so they aren't
necessary. The clutter-units.h patch now sets CLUTTER_UNITS_FORMAT to
'f'.

2009-01-15 18:26:22 +00:00

..

common

Add API for extracting image size from a file

2009-01-12 16:52:20 +00:00

gl

Merge branch 'master' into async-textures

2009-01-12 14:43:53 +00:00

gles

Merge branch 'master' into cogl-float

2009-01-15 18:26:22 +00:00

cogl-color.h

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

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

cogl-deprecated.h

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

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

cogl-fixed.h

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

2008-10-30 17:57:41 +00:00

cogl-mesh.h

Fix warnings in mesh tests

2008-11-12 10:55:06 +00:00

cogl-offscreen.h

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

2008-10-30 17:57:41 +00:00

cogl-path.h

Bug 1172 - Disjoint paths and clip to path

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

cogl-shader.h

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

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

cogl-texture.h

Merge branch 'async-textures'

2009-01-14 15:16:41 +00:00

cogl-types.h

Merge branch 'master' into async-textures

2009-01-12 14:43:53 +00:00

cogl.h.in

Bug 1172 - Disjoint paths and clip to path

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

Makefile.am

Fixed 'make dist'

2008-04-28 16:57:44 +00:00

TODO

Merged clutter-ivan branch into trunk.

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