diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
| commit | aae92e5772fdfc20c44ff48625e968e67cb3f405 (patch) | |
| tree | 1acc3d1689842d3f36326228ba2d694012f53b55 | |
| parent | b56e049fa8ab3ce92efd6c4255a54ca1e0e37b50 (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).
| -rw-r--r-- | xkill.c | 2 | ||||
| -rw-r--r-- | xkill.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xkill/xkill.c,v 1.6 2001/12/14 20:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/xkill/xkill.c,v 1.5 2001/04/01 14:00:22 tsi Exp $ */ /* * xkill - simple program for destroying unwanted clients @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xkill/xkill.man,v 1.9 2003/09/18 19:01:33 herrb Exp $ +.\" $XFree86: xkill.man,v 1.8 2001/12/14 20:02:06 dawes Exp $ .\" .TH XKILL 1 __xorgversion__ .SH NAME |