diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-11 06:09:05 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-11 06:09:05 +1000 |
| commit | 7158203b081ad34c03382f07e0df748eae235e9b (patch) | |
| tree | ee61efebbafb5464ec090c21b5e05533588789a1 /include/GLES2 | |
| parent | 02025148c28d03d644e3d66dde1a423fe21e1c44 (diff) | |
| parent | eb5b16d278e0f7ee0121049e43dfee1d52f2b0f7 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Diffstat (limited to 'include/GLES2')
| -rw-r--r-- | include/GLES2/gl2.h | 1 | ||||
| -rw-r--r-- | include/GLES2/gl2ext.h | 1 | ||||
| -rw-r--r-- | include/GLES2/gl2platform.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index 6466170be5..5ce939c7b9 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 04418c1434..305b29b630 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 7891a61ed7..7e3dbc64b4 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" { |