summaryrefslogtreecommitdiff
path: root/src/glx/x11/glxextensions.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-11-11 14:42:41 -0700
committerBrian Paul <brian.paul@tungstengraphics.com>2008-11-11 14:42:41 -0700
commit19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch)
tree5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /src/glx/x11/glxextensions.h
parent7f3d45758ccbbcff6428d57d26794960e3e9532c (diff)
parent90246d3ea54f54d60593dce1b89f0226058a3c56 (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/glx/x11/glxextensions.h')
-rw-r--r--src/glx/x11/glxextensions.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glx/x11/glxextensions.h b/src/glx/x11/glxextensions.h
index e7998986da..9f1c697487 100644
--- a/src/glx/x11/glxextensions.h
+++ b/src/glx/x11/glxextensions.h
@@ -1,4 +1,3 @@
-/* -*- mode: c; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3; coding: utf-8-unix -*- */
/*
* (C) Copyright IBM Corporation 2002, 2004
* All Rights Reserved.