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

..

clutter

Merge commit 'origin/master' into 1.0-integration

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

cogl

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

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

ChangeLog

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

2008-12-08 14:22:39 +00:00

Makefile.am

[docs] Build COGL API reference first

2009-01-21 10:58:32 +00:00