diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
| commit | 3d4783e06169c3b96eea0a9826c06d8c6a12ae02 (patch) | |
| tree | 1008a7775a52ce81a8b28a5ff5cf2bc58527d5ff /options.c | |
| parent | 6503c7eb0c08963d1842ecbae540e40fc408f6f1 (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-BASE
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 'options.c')
| -rw-r--r-- | options.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/options.c,v 1.14 2002/11/10 23:21:56 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/options.c,v 1.13 2002/09/22 07:09:05 paulo Exp $ */ #include <stdio.h> #include <stdlib.h> |