Robert Bragg 3d07e34cc5 Merge commit 'origin/master' into cogl-material ... Conflicts: clutter/clutter-texture.c clutter/cogl/cogl-texture.h clutter/cogl/cogl.h.in clutter/cogl/common/Makefile.am clutter/cogl/gl/Makefile.am clutter/cogl/gles/Makefile.am clutter/cogl/gles/cogl-gles2-wrapper.c clutter/cogl/gles/cogl-gles2-wrapper.h		2009-01-23 15:23:49 +00:00
..
common	Merge commit 'origin/master' into cogl-material	2009-01-23 15:23:49 +00:00
gl	Merge commit 'origin/master' into cogl-material	2009-01-23 15:23:49 +00:00
gles	Merge commit 'origin/master' into cogl-material	2009-01-23 15:23:49 +00:00
cogl-color.h	[Automatic fixed-to-float.sh change] Applies a number fixed to float patches	2009-01-20 16:20:54 +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	[Automatic fixed-to-float.sh change] Applies a number fixed to float patches	2009-01-20 16:20:54 +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-offscreen.h	2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-30 17:57:41 +00:00
cogl-path.h	[Automatic fixed-to-float.sh change] Applies a number fixed to float patches	2009-01-20 16:20:54 +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-23 15:23:49 +00:00
cogl-types.h	Change the COGL texture constructor to use flags	2009-01-21 10:14:29 +00:00
cogl-vertex-buffer.h	[docs] Remove sources of warnings in API references	2009-01-21 16:41:18 +00:00
cogl.h.in	Merge commit 'origin/master' into cogl-material	2009-01-23 15:23:49 +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