diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:32 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:32 +0000 |
commit | 6200a59d08830ff6344825317cf72d67e4aee78c (patch) | |
tree | 9403937857f5dde8948f5e69e55d1f4ddb9c155b | |
parent | 6549707c976bf68cb56f8b807196c7ad848bdfe4 (diff) |
merge XFree86 RC2 (4.3.99.902) from vendor branchXORG-RELEASE-1-BASEXINERAMA_2XEVIE
-rw-r--r-- | grid.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |