mutter/common
Robert Bragg 0c8c273980 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
..
cogl-bitmap-fallback.c 2008-06-30 Emmanuele Bassi <ebassi@openedhand.com> 2008-06-30 14:20:46 +00:00
cogl-bitmap-pixbuf.c Add API for extracting image size from a file 2009-01-12 16:52:20 +00:00
cogl-bitmap.c Add API for extracting image size from a file 2009-01-12 16:52:20 +00:00
cogl-bitmap.h Add API for extracting image size from a file 2009-01-12 16:52:20 +00:00
cogl-clip-stack.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +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 [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
cogl-fixed.c Improve accuracy of clutter_sinx() 2009-01-22 15:59:23 +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-primitives.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
cogl-primitives.h [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +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
cogl-vertex-buffer-private.h Renames the mesh api to the "vertex buffer api". 2009-01-20 22:29:35 +00:00
cogl-vertex-buffer.c Renames the mesh api to the "vertex buffer api". 2009-01-20 22:29:35 +00:00
Makefile.am Merge commit 'origin/master' into cogl-material 2009-01-23 15:23:49 +00:00
stb_image.c Merged clutter-ivan branch into trunk. 2008-04-25 13:37:36 +00:00