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

---
 include/cursor.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/cursor.h')

diff --git a/include/cursor.h b/include/cursor.h
index 7509a94af..512133eb3 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
-- 
cgit v1.2.3