Merge branch 'master' into cogl-material

Browse Source

Conflicts:

	clutter/cogl/gl/cogl-context.c
	clutter/cogl/gl/cogl-context.h

...

This commit is contained in:

Robert Bragg 2008-12-24 00:59:13 +00:00

parent 5b61106684 baa63b7c46

commit ef992f55db

4 changed files with 289 additions and 289 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files