summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/mga/mga_texstate.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-05-27 00:59:41 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-05-27 00:59:41 +1000
commit0f9635d9d522ea712724415599ceb44d53e67819 (patch)
tree91484d00053baeb265d04a54a116229562194217 /src/mesa/drivers/dri/mga/mga_texstate.c
parent8f67f98959261d193cb5f3db274b55fb24e2bb1e (diff)
parent253066d716e3039522eeb7b072811cccd89b4a82 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/drivers/dri/mga/mga_texstate.c')
-rw-r--r--src/mesa/drivers/dri/mga/mga_texstate.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/mga/mga_texstate.c b/src/mesa/drivers/dri/mga/mga_texstate.c
index 71d264b0f1..c14ddc95c9 100644
--- a/src/mesa/drivers/dri/mga/mga_texstate.c
+++ b/src/mesa/drivers/dri/mga/mga_texstate.c
@@ -26,7 +26,6 @@
* Ian Romanick <idr@us.ibm.com>
* Keith Whitwell <keithw@tungstengraphics.com>
*/
-/* $XFree86:$ */
#include <stdlib.h>
#include "mm.h"