summaryrefslogtreecommitdiff
path: root/src/mga_dri.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:45 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:45 +0000
commita8f3f90a24db1c2754c5be6c9b0394d403ec00ca (patch)
treebfc99c3d4bdcc4ef6bb59fcca5294ef1f49e1fec /src/mga_dri.h
parent03f00bf8411e6c36d3aef1907e42a52854353101 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/mga_dri.h')
-rw-r--r--src/mga_dri.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mga_dri.h b/src/mga_dri.h
index b9ed1c2..fdd1272 100644
--- a/src/mga_dri.h
+++ b/src/mga_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.8 2002/11/29 11:06:42 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.6 2001/04/10 16:08:01 dawes Exp $ */
/*
* Copyright 2000 VA Linux Systems Inc., Fremont, California.