diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-11 18:32:05 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-11 18:32:05 +0100 |
| commit | cc7dd4fc1b3c765ca1ecd943d189bb156dae529d (patch) | |
| tree | 1a3560eb6df8a443c4f0e5af0a916f190b1542f6 /include | |
| parent | 685248bea1fef5fd6335982570e34d0f6672030d (diff) | |
| parent | d50d68a1c940ed9c8d8c65e8e33667fa90d5baa1 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
Makefile
progs/demos/Makefile
progs/glsl/Makefile
progs/redbook/Makefile
progs/samples/Makefile
progs/tests/Makefile
progs/trivial/Makefile
progs/xdemos/Makefile
src/gallium/Makefile
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/GLES/gl.h | 1 | ||||
| -rw-r--r-- | include/GLES/glext.h | 1 | ||||
| -rw-r--r-- | include/GLES/glplatform.h | 1 | ||||
| -rw-r--r-- | include/GLES2/gl2.h | 1 | ||||
| -rw-r--r-- | include/GLES2/gl2ext.h | 1 | ||||
| -rw-r--r-- | include/GLES2/gl2platform.h | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/include/GLES/gl.h b/include/GLES/gl.h index 76cc94798..8ffcdc1db 100644 --- a/include/GLES/gl.h +++ b/include/GLES/gl.h @@ -1,7 +1,6 @@ #ifndef __gl_h_ #define __gl_h_ -/* $Id: gl.h 4533 2007-11-26 11:19:35Z markc $ */ #include <GLES/glplatform.h> diff --git a/include/GLES/glext.h b/include/GLES/glext.h index 4de33bc8b..a55829489 100644 --- a/include/GLES/glext.h +++ b/include/GLES/glext.h @@ -1,7 +1,6 @@ #ifndef __glext_h_ #define __glext_h_ -/* $Id: glext.h 5687 2008-05-13 21:31:32Z oddhack $ */ #ifdef __cplusplus extern "C" { diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index 6e725b18a..7c8392bfc 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -1,7 +1,6 @@ #ifndef __glplatform_h_ #define __glplatform_h_ -/* $Id: glplatform.h 4585 2007-11-30 09:49:39Z markc $ */ #ifdef __cplusplus extern "C" { diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index 6466170be..5ce939c7b 100644 --- a/include/GLES2/gl2.h +++ b/include/GLES2/gl2.h @@ -1,7 +1,6 @@ #ifndef __gl2_h_ #define __gl2_h_ -/* $Id: gl2.h 5418 2008-03-26 19:57:12Z oddhack $ */ #include <GLES2/gl2platform.h> diff --git a/include/GLES2/gl2ext.h b/include/GLES2/gl2ext.h index 04418c143..305b29b63 100644 --- a/include/GLES2/gl2ext.h +++ b/include/GLES2/gl2ext.h @@ -1,7 +1,6 @@ #ifndef __gl2ext_h_ #define __gl2ext_h_ -/* $Id: gl2ext.h 5767 2008-06-02 17:44:20Z benj $ */ #ifdef __cplusplus extern "C" { diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 7891a61ed..7e3dbc64b 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -1,7 +1,6 @@ #ifndef __gl2platform_h_ #define __gl2platform_h_ -/* $Id: gl2platform.h 4532 2007-11-26 11:12:44Z markc $ */ #ifdef __cplusplus extern "C" { |