diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:37 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:37 +0000 |
| commit | 077bbfb433f5035fa34eb2079fedf7bf4b4f639f (patch) | |
| tree | dbb9d9811410d823420c29e67e6b14b94eddf831 /makeform.c | |
| parent | 53af03d591c7297c7b8c3e7f8c6f804677f8e325 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'makeform.c')
| -rw-r--r-- | makeform.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/xmessage/makeform.c,v 1.7 2003/04/14 23:03:13 herrb Exp $ */ +/* $XFree86: xc/programs/xmessage/makeform.c,v 1.6 2002/11/22 03:56:39 paulo Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> |