Robert Bragg bb938ac4ff Merge branch 'master' into cogl-material ... Conflicts: clutter/cogl/gl/cogl-context.c clutter/cogl/gl/cogl-context.h		2008-12-24 00:59:13 +00:00
..
common	[doc] Hooks up cogl-material reference documentation	2008-12-22 16:35:52 +00:00
gl	Merge branch 'master' into cogl-material	2008-12-24 00:59:13 +00:00
gles	Updates previous GLES multi-texturing code to use CoglMaterial	2008-12-22 16:35:52 +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	[doc] Hooks up cogl-material reference documentation	2008-12-22 16:35:52 +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 branch 'master' into cogl-material	2008-12-24 00:59:13 +00:00
cogl-types.h	2008-11-12 Emmanuele Bassi <ebassi@linux.intel.com>	2008-11-12 13:57:58 +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