diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-11 14:42:41 -0700 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-11 14:42:41 -0700 |
commit | 19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch) | |
tree | 5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /src/mesa/glapi/extension_helper.py | |
parent | 7f3d45758ccbbcff6428d57d26794960e3e9532c (diff) | |
parent | 90246d3ea54f54d60593dce1b89f0226058a3c56 (diff) |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'src/mesa/glapi/extension_helper.py')
-rw-r--r-- | src/mesa/glapi/extension_helper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/glapi/extension_helper.py b/src/mesa/glapi/extension_helper.py index f7fa90c3900..375e3ea59e7 100644 --- a/src/mesa/glapi/extension_helper.py +++ b/src/mesa/glapi/extension_helper.py @@ -151,7 +151,7 @@ class PrintGlExtensionGlue(gl_XML.gl_print_base): def printRealHeader(self): print '#include "utils.h"' - print '#include "dispatch.h"' + print '#include "glapi/dispatch.h"' print '' return |