summaryrefslogtreecommitdiff
path: root/src/atividmem.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:26:46 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:26:46 +0000
commit3586c3c7955365a2af0b8a286ea0d0488ddfd137 (patch)
tree2a60b5e46470b686d3f034b3b4bd085f043af26e /src/atividmem.c
parent538768e0f472026325be9dd37dc4bfe7ea7d3b75 (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/atividmem.c')
-rw-r--r--src/atividmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/atividmem.c b/src/atividmem.c
index 188e0ea..048b13a 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atividmem.c,v 1.16 2004/01/05 16:42:05 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atividmem.c,v 1.15 2003/04/23 21:51:31 tsi Exp $ */
/*
* Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*