diff options
| author | Rik Faith <faith@alephnull.com> | 2000-01-07 06:54:54 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-01-07 06:54:54 +0000 |
| commit | 9243a76e0384f66c6c6799917affffbd9ca38ec6 (patch) | |
| tree | 9a791cc62a45928986053af744455943f2ea982c | |
| parent | bf0e55959f6c73731500ed9a0d4decc17c9523cd (diff) | |
Merge between X_3_9_16 and X_3_9_17 Compiles but may not run.smt-0-0-1-stage2csmt-0-0-1-20000222-freezesmt-0-0-1-20000112-basesmt-0-0-1-stage2bsmt-0-0-1-branch
| -rw-r--r-- | libdrm/xf86drm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 542356e10..fd0c75a7f 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -1,6 +1,6 @@ /* xf86drm.c -- User-level interface to DRM device * Created: Tue Jan 5 08:16:21 1999 by faith@precisioninsight.com - * Revised: Mon Dec 6 11:34:13 1999 by faith@precisioninsight.com + * Revised: Thu Jan 6 10:32:25 2000 by faith@precisioninsight.com * * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. @@ -24,8 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.43 1999/08/04 18:14:43 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.5 1999/10/13 22:33:07 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.6 1999/12/14 01:33:54 robin Exp $ * */ |