Robert Bragg bb938ac4ff Merge branch 'master' into cogl-material
Conflicts:

	clutter/cogl/gl/cogl-context.c
	clutter/cogl/gl/cogl-context.h
2008-12-24 00:59:13 +00:00
..
2008-12-18 17:54:35 +00:00
2008-12-19 16:44:40 +00:00
2008-12-23 20:55:35 +00:00
2008-10-31 12:07:01 +00:00
2008-12-05 14:08:06 +00:00
2008-12-11 15:34:47 +00:00
2008-12-11 15:34:47 +00:00