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 | 7c14b1189ac8605de9be3d85c338563396bb9c06 (patch) | |
| tree | cbfc7edb12953847e14f881d742225a3edb8cf89 | |
| parent | f47ae0017ff8c7fa8ec7c5a9da7e3d5775ee2673 (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,rel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XORG-6_8-branch
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.
| -rw-r--r-- | src/ffb_dri.c | 2 | ||||
| -rw-r--r-- | src/ffb_drishare.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ffb_dri.c b/src/ffb_dri.c index b905216..d6230e3 100644 --- a/src/ffb_dri.c +++ b/src/ffb_dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.9 2001/05/02 15:06:10 dawes Exp $ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.8 2001/04/18 14:52:42 dawes Exp $ * Acceleration for the Creator and Creator3D framebuffer - DRI/DRM support. * * Copyright (C) 2000 David S. Miller (davem@redhat.com) diff --git a/src/ffb_drishare.h b/src/ffb_drishare.h index f023920..c439129 100644 --- a/src/ffb_drishare.h +++ b/src/ffb_drishare.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h,v 1.2 2000/06/21 00:47:37 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_DRISHARE_H #define _FFB_DRISHARE_H |