diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:19 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:19 +0000 |
| commit | 77e111106a8d1ea5fc74f993e7a1366aba4cff47 (patch) | |
| tree | 06fc0966a90dc30078a28f7dadc8274ca392d003 | |
| parent | 6317cea2a11415d794a60a0b4d7e3f99859c82fb (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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-- | xcursorgen.c | 2 | ||||
| -rw-r--r-- | xcursorgen.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xcursorgen.c b/xcursorgen.c index 4a94a1e..c07b186 100644 --- a/xcursorgen.c +++ b/xcursorgen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xcursorgen/xcursorgen.c,v 1.9 2003/04/21 14:15:35 herrb Exp $ */ +/* $XFree86: xc/programs/xcursorgen/xcursorgen.c,v 1.8 2002/11/23 02:33:20 keithp Exp $ */ /* * xcursorgen.c * diff --git a/xcursorgen.man b/xcursorgen.man index 94884b2..727c08e 100644 --- a/xcursorgen.man +++ b/xcursorgen.man @@ -19,7 +19,7 @@ .\" PERFORMANCE OF THIS SOFTWARE. .\" .\" -.\" $XFree86: xc/programs/xcursorgen/xcursorgen.man,v 1.3 2003/06/12 14:12:39 eich Exp $ +.\" $XFree86: xc/programs/xcursorgen/xcursorgen.man,v 1.1 2002/09/03 06:48:28 keithp Exp $ .\" .TH XCURSORGEN 1 __vendorversion__ .SH NAME |