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 | b87b99f01335f6201c0d98b5333cd48b84977743 (patch) | |
tree | 6e6b4b9d3b774860b2fb6794ba2286655aeb4ef6 | |
parent | 34150bdcff5165342bb0f4a6402eff79ee09a8bd (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).
-rw-r--r-- | xev.c | 2 | ||||
-rw-r--r-- | xev.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/xev/xev.c,v 1.14 2004/02/07 04:33:07 dawes Exp $ */ +/* $XFree86: xc/programs/xev/xev.c,v 1.13 2003/10/24 20:38:17 tsi Exp $ */ /* * Author: Jim Fulton, MIT X Consortium @@ -1,6 +1,6 @@ .\" $XConsortium: xev.man,v 1.10 94/04/17 20:45:20 gildea Exp $ .\" -.\" $XFree86: xc/programs/xev/xev.man,v 1.4 2003/05/24 15:49:02 herrb Exp $ +.\" $XFree86: xc/programs/xev/xev.man,v 1.3 2001/01/27 18:21:11 dawes Exp $ .\" .TH XEV 1 __xorgversion__ .SH NAME |