diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-27 00:59:41 +1000 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-27 00:59:41 +1000 |
commit | 0f9635d9d522ea712724415599ceb44d53e67819 (patch) | |
tree | 91484d00053baeb265d04a54a116229562194217 /src/mesa/drivers/dri/mga/server/mga_macros.h | |
parent | 8f67f98959261d193cb5f3db274b55fb24e2bb1e (diff) | |
parent | 253066d716e3039522eeb7b072811cccd89b4a82 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/drivers/dri/mga/server/mga_macros.h')
-rw-r--r-- | src/mesa/drivers/dri/mga/server/mga_macros.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/mga/server/mga_macros.h b/src/mesa/drivers/dri/mga/server/mga_macros.h index d985081ab6..189e1415d0 100644 --- a/src/mesa/drivers/dri/mga/server/mga_macros.h +++ b/src/mesa/drivers/dri/mga/server/mga_macros.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.22 2002/02/20 17:17:50 dawes Exp $ */ #ifndef _MGA_MACROS_H_ #define _MGA_MACROS_H_ |