Robert Bragg a0c5690d55 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
..
cogl-bitmap-fallback.c	2008-06-30 Emmanuele Bassi <ebassi@openedhand.com>	2008-06-30 14:20:46 +00:00
cogl-bitmap-pixbuf.c	2008-08-27 Emmanuele Bassi <ebassi@openedhand.com>	2008-08-27 12:56:54 +00:00
cogl-bitmap.c	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
cogl-bitmap.h	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
cogl-clip-stack.c	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
cogl-clip-stack.h	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
cogl-color.c	2008-11-12 Emmanuele Bassi <ebassi@linux.intel.com>	2008-11-12 13:57:58 +00:00
cogl-fixed.c	* clutter/cogl/gles/cogl.c (cogl_perspective):	2008-11-06 11:42:11 +00:00
cogl-handle.h	[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2	2008-12-22 16:35:51 +00:00
cogl-material-private.h	[cogl-material] improvements for cogl_material_rectangle	2008-12-24 01:35:33 +00:00
cogl-material.c	[cogl-material] Adds a cogl_material_set_color function	2008-12-24 01:35:02 +00:00
cogl-matrix.c	Adds CoglMatrix utility code	2008-12-22 16:35:52 +00:00
cogl-mesh-private.h	Bug 1164 - Implements the proposed Mesh API	2008-11-10 18:53:14 +00:00
cogl-mesh.c	[docs] Documentation warnings	2009-01-09 14:26:35 +00:00
cogl-primitives.c	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
cogl-primitives.h	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
cogl-util.c	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
cogl-util.h	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
Makefile.am	Merge commit 'origin/master' into cogl-material	2009-01-13 13:37:38 +00:00
stb_image.c	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00