brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into cogl-material

Browse Source 
Conflicts:

	clutter/clutter-texture.c
	clutter/cogl/cogl-texture.h
	clutter/cogl/gles/cogl-context.c
	clutter/cogl/gles/cogl-context.h
This commit is contained in:
Robert Bragg
2009-01-13 13:37:38 +00:00
parent 12ea2933bd be462b2ea8
commit 616c082a7c
80 changed files with 6668 additions and 5027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/reference/cogl/cogl-sections.txt
View File

@ -120,6 +120,7 @@ cogl_texture_set_region
cogl_texture_ref
cogl_texture_unref
cogl_texture_rectangle
cogl_texture_multiple_rectangles
cogl_texture_polygon
</SECTION>