summaryrefslogtreecommitdiff
path: root/src/radeon_dripriv.h
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2004-06-16 09:43:59 +0000
committerEric Anholt <anholt@freebsd.org>2004-06-16 09:43:59 +0000
commit6ecf374d500afe6da494dfdd6566396ec65b6d6a (patch)
treec53d543a00984defdb71042dedc755baadea6f3e /src/radeon_dripriv.h
parentbea8085e04136b0ef513c17bb65c54069ec531e1 (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/radeon_dripriv.h')
-rw-r--r--src/radeon_dripriv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_dripriv.h b/src/radeon_dripriv.h
index 59f54589..34e5dbc9 100644
--- a/src/radeon_dripriv.h
+++ b/src/radeon_dripriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h,v 1.4 2002/10/30 12:52:13 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h,v 1.3 2002/04/24 16:20:40 martin Exp $ */
/*
* Copyright 2000 ATI Technologies Inc., Markham, Ontario,
* VA Linux Systems Inc., Fremont, California.