Merge commit 'origin/master' into cogl-material
authorRobert Bragg <robert@linux.intel.com>
Fri, 23 Jan 2009 15:23:49 +0000 (15:23 +0000)
committerRobert Bragg <robert@linux.intel.com>
Fri, 23 Jan 2009 15:23:49 +0000 (15:23 +0000)
commit3d07e34cc54568a2e41cbd8565b6b21aa6dc5f53
tree170a1c3278a4195a24c1984a48f83e4b4f684e4a
parent616c082a7cc6cf9a46de09f2f04ed87a57162e9c
parent634cdeab1fe574d5cbf41ed48951d8bb7bc2d9b0
Merge commit 'origin/master' into cogl-material

Conflicts:

clutter/clutter-texture.c
clutter/cogl/cogl-texture.h
clutter/cogl/cogl.h.in
clutter/cogl/common/Makefile.am
clutter/cogl/gl/Makefile.am
clutter/cogl/gles/Makefile.am
clutter/cogl/gles/cogl-gles2-wrapper.c
clutter/cogl/gles/cogl-gles2-wrapper.h
19 files changed:
clutter/clutter-clone-texture.c
clutter/clutter-texture.c
clutter/clutter-texture.h
clutter/cogl/cogl-texture.h
clutter/cogl/cogl.h.in
clutter/cogl/common/Makefile.am
clutter/cogl/gl/Makefile.am
clutter/cogl/gl/cogl-context.c
clutter/cogl/gl/cogl-context.h
clutter/cogl/gl/cogl-texture.c
clutter/cogl/gles/Makefile.am
clutter/cogl/gles/cogl-context.c
clutter/cogl/gles/cogl-context.h
clutter/cogl/gles/cogl-gles2-wrapper.c
clutter/cogl/gles/cogl-gles2-wrapper.h
clutter/cogl/gles/cogl-texture.c
doc/reference/cogl/cogl-docs.sgml
doc/reference/cogl/cogl-sections.txt
tests/interactive/Makefile.am