From b2fec4bfd950c450c774543b3336e1beb0bd9aa1 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:55:06 +0000
Subject: Merging XORG-CURRENT into trunk

---
 lock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lock.h')

diff --git a/lock.h b/lock.h
index 9e3af89..19805ef 100644
--- a/lock.h
+++ b/lock.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 ******************************************************************************/
-/* $XFree86: xc/programs/xsm/lock.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/lock.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _LOCK_H_
 #define _LOCK_H_
-- 
cgit v1.2.3