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

---
 hw/darwin/quartz/xpr/x-hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hw/darwin/quartz/xpr/x-hash.c')

diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index ad36204c5..632ffdb33 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-hash.h"
 #include "x-list.h"
-- 
cgit v1.2.1