summaryrefslogtreecommitdiff
path: root/src/atividmem.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:35:23 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:35:23 +0000
commit42cbea1d05a9e44b0d560da29bff19711ebb8a94 (patch)
tree4b4ac0ed48b0c0f4854fc7e090e015ea3d2bee13 /src/atividmem.c
parent0779e46ecd01e3f0e413cedfff6df7b3b70618c2 (diff)
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src/atividmem.c')
-rw-r--r--src/atividmem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/atividmem.c b/src/atividmem.c
index 1b866598..188e0eac 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atividmem.c,v 1.15 2003/04/23 21:51:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atividmem.c,v 1.16 2004/01/05 16:42:05 tsi Exp $ */
/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that