summaryrefslogtreecommitdiff
path: root/src/atilock.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:39 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:39 +0000
commitec3f00ae3c2b6d521364161674ff5d88e10cc62c (patch)
tree5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/atilock.h
parent42cbea1d05a9e44b0d560da29bff19711ebb8a94 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/atilock.h')
-rw-r--r--src/atilock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/atilock.h b/src/atilock.h
index 9f1ad271..70c63936 100644
--- a/src/atilock.h
+++ b/src/atilock.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.h,v 1.6 2004/01/05 16:42:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.h,v 1.5 2003/01/01 19:16:32 tsi Exp $ */
/*
* Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*