summaryrefslogtreecommitdiff
path: root/include/GLES/gl.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-09-11 18:32:05 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-11 18:32:05 +0100
commitcc7dd4fc1b3c765ca1ecd943d189bb156dae529d (patch)
tree1a3560eb6df8a443c4f0e5af0a916f190b1542f6 /include/GLES/gl.h
parent685248bea1fef5fd6335982570e34d0f6672030d (diff)
parentd50d68a1c940ed9c8d8c65e8e33667fa90d5baa1 (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/GLES/gl.h')
-rw-r--r--include/GLES/gl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/GLES/gl.h b/include/GLES/gl.h
index 76cc947983..8ffcdc1db3 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>