diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:14 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:14 +0000 |
| commit | 9495594a9369c9a69198f7b492d16d167b371af5 (patch) | |
| tree | 9a66fc60717c658b3e597820e8a726b3865e69c0 /props.c | |
| parent | 437014f2dc8502f882d5f5c84a10cabe88d00793 (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 'props.c')
| -rw-r--r-- | props.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/props.c,v 1.6 2001/12/14 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/props.c,v 1.5 2001/01/17 23:44:54 dawes Exp $ */ #include <stdio.h> #include <string.h> |