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

---
 grid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index acae07d..f4632f2 100644
--- a/grid.c
+++ b/grid.c
@@ -1,4 +1,5 @@
 /*
+ * $XdotOrg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
  * $Xorg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
  *
  * 
@@ -26,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/xfd/grid.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */
+/* $XFree86: xc/programs/xfd/grid.c,v 1.9 2002/07/06 00:46:42 keithp Exp $ */
 
 
 #include <X11/IntrinsicP.h>
-- 
cgit v1.2.3