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
..
common	Merge commit 'origin/master' into cogl-material	2009-01-13 13:37:38 +00:00
gl	Merge commit 'origin/master' into cogl-material	2009-01-13 13:37:38 +00:00
gles	Merge commit 'origin/master' into cogl-material	2009-01-13 13:37:38 +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-material.h	[cogl-material] Adds a cogl_material_set_color function	2008-12-24 01:35:02 +00:00
cogl-matrix.h	[doc] Hooks up cogl-matrix reference documentation	2008-12-22 16:35:52 +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 commit 'origin/master' into cogl-material	2009-01-13 13:37:38 +00:00
cogl-types.h	[docs] Documentation warnings	2009-01-09 14:26:35 +00:00
cogl.h.in	Adds a CoglMaterial abstraction, which includes support for multi-texturing	2008-12-22 16:35:52 +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