diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:41 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:41 +0000 |
| commit | 4b9f8a6bb5e2bd7129339264aab23f3818ff4952 (patch) | |
| tree | 888f35ef0f85b788b285166c83fe743033d031e9 | |
| parent | 67c2de8d39f56345bd5a5b40b8bd93a5a6aac9de (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | xcursorgen.c | 2 | ||||
| -rw-r--r-- | xcursorgen.man | 4 |
2 files changed, 3 insertions, 3 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..52d5750 100644 --- a/xcursorgen.man +++ b/xcursorgen.man @@ -1,5 +1,5 @@ .\" -.\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\" +.\" Copyright 2002 Keith Packard.\" .\" Permission to use, copy, modify, distribute, and sell this software and its .\" documentation for any purpose is hereby granted without fee, provided that .\" the above copyright notice appear in all copies and that both that @@ -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 |