From 6200a59d08830ff6344825317cf72d67e4aee78c Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat, 20 Dec 2003 00:28:32 +0000
Subject: merge XFree86 RC2 (4.3.99.902) from vendor branch

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

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index f2125c1..af3d190 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,13 +27,14 @@ 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.9 2002/07/06 00:46:42 keithp Exp $ */
+/* $XFree86: xc/programs/xfd/grid.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */
 
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xaw/SimpleP.h>
 #include <X11/Xmu/Converters.h>
+#include <X11/Xos.h>
 #include "gridP.h"
 
 #ifdef XKB
-- 
cgit v1.2.3