Neil Roberts bafcfca797 Merge commit 'git-svn' into multiple-texture-rectangle ... Conflicts: clutter/cogl/gl/cogl-texture.c		2008-12-04 18:20:57 +00:00
..
common	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
gl	Merge commit 'git-svn' into multiple-texture-rectangle	2008-12-04 18:20:57 +00:00
gles	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +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-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	Add cogl_texture_multiple_rectangles	2008-11-28 13:09:04 +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	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +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