diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
| commit | 9f88bd45033f99a5c8cfe15aab538c3b17f50db1 (patch) | |
| tree | 67481e4ec48769dd4f4770ed7cf1b2163ab9d46f | |
| parent | 13da95e5ca17b0bd5dbba5e8deff7a133ab463a5 (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-- | xsetpointer.c | 2 | ||||
| -rw-r--r-- | xsetpointer.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xsetpointer.c b/xsetpointer.c index 4682de2..0eac310 100644 --- a/xsetpointer.c +++ b/xsetpointer.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xsetpointer/xsetpointer.c,v 3.8 2003/07/21 14:59:32 tsi Exp $ */ +/* $XFree86: xc/programs/xsetpointer/xsetpointer.c,v 3.7 2003/05/27 22:27:10 tsi Exp $ */ /* * Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> diff --git a/xsetpointer.man b/xsetpointer.man index fd88a24..e833611 100644 --- a/xsetpointer.man +++ b/xsetpointer.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/xsetpointer/xsetpnt.man,v 3.1 2001/01/27 18:21:23 dawes Exp $ +.\" $XFree86: xc/programs/xsetpointer/xsetpnt.man,v 3.0 1995/12/26 06:10:25 dawes Exp $ .\" .TH xsetpointer 1 __vendorversion__ .SH NAME |