summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:10 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:10 +0000
commit6317cea2a11415d794a60a0b4d7e3f99859c82fb (patch)
tree6a2fd1f0ff225b892ed0433657c572a759bf64cd
parent439e6e965ce471e53cd740549743fea761c46dda (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
-rw-r--r--xcursorgen.c4
-rw-r--r--xcursorgen.man5
2 files changed, 4 insertions, 5 deletions
diff --git a/xcursorgen.c b/xcursorgen.c
index f418f99..4a94a1e 100644
--- a/xcursorgen.c
+++ b/xcursorgen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xcursorgen/xcursorgen.c,v 1.8 2002/11/23 02:33:20 keithp Exp $ */
+/* $XFree86: xc/programs/xcursorgen/xcursorgen.c,v 1.9 2003/04/21 14:15:35 herrb Exp $ */
/*
* xcursorgen.c
*
@@ -16,7 +16,7 @@
*
* MANISH SINGH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * EVENT SHALL MANISH SINGH BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
diff --git a/xcursorgen.man b/xcursorgen.man
index 91921e6..94884b2 100644
--- a/xcursorgen.man
+++ b/xcursorgen.man
@@ -1,6 +1,5 @@
.\"
-.\" Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
-.\"
+.\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\"
.\" 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
@@ -20,7 +19,7 @@
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.\" $XFree86: xc/programs/xcursorgen/xcursorgen.man,v 1.2 2003/01/04 02:59:18 dawes Exp $
+.\" $XFree86: xc/programs/xcursorgen/xcursorgen.man,v 1.3 2003/06/12 14:12:39 eich Exp $
.\"
.TH XCURSORGEN 1 __vendorversion__
.SH NAME