diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-17 06:23:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-17 06:23:51 +0000 |
| commit | a10f507ac4aa4e12e9e8cf6e745aafd69648ad91 (patch) | |
| tree | 7297a8cba5e42a39d0242b6b65bf57bfa6b97eca /X11/Xresource.h | |
| parent | adda30e64c2a83d33dba7c7fe609b9b638ad2253 (diff) | |
| download | vcxsrv-a10f507ac4aa4e12e9e8cf6e745aafd69648ad91.tar.gz vcxsrv-a10f507ac4aa4e12e9e8cf6e745aafd69648ad91.tar.bz2 vcxsrv-a10f507ac4aa4e12e9e8cf6e745aafd69648ad91.zip | |
Made files the same that should be the same.
Added batch fiesl for checking that these files are the same.
Diffstat (limited to 'X11/Xresource.h')
| -rw-r--r-- | X11/Xresource.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/X11/Xresource.h b/X11/Xresource.h index ce1213748..56cc5adb4 100644 --- a/X11/Xresource.h +++ b/X11/Xresource.h @@ -29,13 +29,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -178,7 +178,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase; extern void XrmDestroyDatabase( - XrmDatabase /* database */ + XrmDatabase /* database */ ); extern void XrmQPutResource( @@ -333,7 +333,7 @@ typedef enum { XrmoptionResArg, /* Resource and value in next argument in argv */ XrmoptionSkipArg, /* Ignore this option and the next argument in argv */ XrmoptionSkipLine, /* Ignore this option and the rest of argv */ - XrmoptionSkipNArgs /* Ignore this option and the next + XrmoptionSkipNArgs /* Ignore this option and the next OptionDescRes.value arguments in argv */ } XrmOptionKind; @@ -351,7 +351,7 @@ extern void XrmParseCommand( int /* table_count */, _Xconst char* /* name */, int* /* argc_in_out */, - char** /* argv_in_out */ + char** /* argv_in_out */ ); _XFUNCPROTOEND |