Neil Roberts 145cc9d3df Merge remote branch 'master' into texture-debugging ... Conflicts: clutter/cogl/cogl/cogl-context.h		2010-02-01 13:37:19 +00:00
..
clutter	Merge branch 'device-manager'	2010-02-01 11:26:56 +00:00
cogl	Merge remote branch 'master' into texture-debugging	2010-02-01 13:37:19 +00: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