From 3586c3c7955365a2af0b8a286ea0d0488ddfd137 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 19:26:46 +0000 Subject: Merging XORG-CURRENT into trunk --- src/atilock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/atilock.h') diff --git a/src/atilock.h b/src/atilock.h index 9f1ad27..70c6393 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 * -- cgit v1.2.3