Merge remote branch 'master' into texture-debugging
authorNeil Roberts <neil@linux.intel.com>
Mon, 1 Feb 2010 13:37:19 +0000 (13:37 +0000)
committerNeil Roberts <neil@linux.intel.com>
Mon, 1 Feb 2010 13:37:19 +0000 (13:37 +0000)
commit145cc9d3dfd1dc51f254eefde35042fc20a6375e
tree21769c0d0b7564631093a00f3fb84377c94d458e
parentaa6731e338a88d03e718980604ac8f2393391a9f
parent5f1c8a17e4f81ead1747b47939d593c80246bf06
Merge remote branch 'master' into texture-debugging

Conflicts:
clutter/cogl/cogl/cogl-context.h
clutter/cogl/cogl/cogl-context.h
clutter/cogl/cogl/cogl-journal.c
clutter/cogl/cogl/cogl-material.c
clutter/cogl/cogl/cogl-types.h
clutter/cogl/cogl/cogl-vertex-buffer.c