diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
| commit | e9a123f08880882a519b6eba8305d62ac375ca10 (patch) | |
| tree | d4feaa851ea9a74f6f7a61eacd1c0df6db43127d /src/mga_dri.h | |
| parent | 1ca2311bee53e99b49a860862e4010e58c918585 (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
with the following notes:
- Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
insecurity.
- VIA driver converted to new drmContext and drmHandle names.
- Radeon driver merge conflicted in many places, and MergedFB at least
could probably use some checking at this point.
Diffstat (limited to 'src/mga_dri.h')
| -rw-r--r-- | src/mga_dri.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mga_dri.h b/src/mga_dri.h index 5785a34..6d2addc 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. |