Merge branch 'master' into more-texture-backends
authorNeil Roberts <neil@linux.intel.com>
Fri, 15 Jan 2010 12:15:46 +0000 (12:15 +0000)
committerNeil Roberts <neil@linux.intel.com>
Fri, 15 Jan 2010 12:15:46 +0000 (12:15 +0000)
commitead43995364bb8865ca5bab15d1bfd295578fff4
treef170423cc941f543dc2190494d2a819f46ee79bf
parent34b50934be581cde0ef2eba75f45aa36b1add14d
parenta70ebe4f52e192c11f8db6a4fa1f419a5b175ab3
Merge branch 'master' into more-texture-backends
clutter/cogl/cogl/Makefile.am
clutter/cogl/cogl/cogl-journal.c
clutter/cogl/cogl/cogl-material.c
clutter/cogl/cogl/cogl-primitives.c
clutter/cogl/cogl/cogl-texture.c
clutter/cogl/cogl/cogl-texture.h
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c
tests/conform/Makefile.am
tests/conform/test-conform-main.c