diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:09 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:09 +0000 |
| commit | 04a815f1c6d9f16d46e6cf7730adb59a65b7eaec (patch) | |
| tree | faad0d1f4550eba1f89c70a7b055a84781296d56 | |
| parent | f324a3d14c3cfbd624be107a18e3fd41ffb705f6 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
| -rw-r--r-- | man/XF86Misc.man | 2 | ||||
| -rw-r--r-- | src/XF86Misc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/XF86Misc.man b/man/XF86Misc.man index e010db2..7c7f3d9 100644 --- a/man/XF86Misc.man +++ b/man/XF86Misc.man @@ -5,7 +5,7 @@ .\" .\" Copyright (c) 1996 Joe Moss, The XFree86 Project .\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man,v 3.13 2003/11/23 05:40:36 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man,v 3.12 2002/12/22 00:46:54 dawes Exp $ .de ZN .ie t \fB\^\\$1\^\fR\\$2 .el \fI\^\\$1\^\fP\\$2 diff --git a/src/XF86Misc.c b/src/XF86Misc.c index 3312d07..b0669d5 100644 --- a/src/XF86Misc.c +++ b/src/XF86Misc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.13 2003/04/03 16:15:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.12 2002/11/20 04:04:57 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc |