diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:53 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:53 +0000 |
| commit | 388178c88e83bdaf731177044345ef45779c63f9 (patch) | |
| tree | a291bca3b63c4979e99b4c3319b9a3c704ca240c | |
| parent | 7a7335496b33ed9b516fddf6a86e4034ea098aa2 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | include/X11/Xcursor/Xcursor.h | 2 | ||||
| -rw-r--r-- | man/Xcursor.man | 4 | ||||
| -rw-r--r-- | src/cursor.c | 2 | ||||
| -rw-r--r-- | src/display.c | 2 | ||||
| -rw-r--r-- | src/file.c | 2 | ||||
| -rw-r--r-- | src/library.c | 2 | ||||
| -rw-r--r-- | src/xcursorint.h | 2 | ||||
| -rw-r--r-- | src/xlib.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/include/X11/Xcursor/Xcursor.h b/include/X11/Xcursor/Xcursor.h index 3176020..c4b4ac2 100644 --- a/include/X11/Xcursor/Xcursor.h +++ b/include/X11/Xcursor/Xcursor.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/Xcursor.h,v 1.4 2003/01/26 03:22:42 eich Exp $ + * $XFree86: xc/lib/Xcursor/Xcursor.h,v 1.3 2002/11/23 02:34:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/man/Xcursor.man b/man/Xcursor.man index a40369b..1976538 100644 --- a/man/Xcursor.man +++ b/man/Xcursor.man @@ -1,6 +1,6 @@ .\" -.\" $XdotOrg: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $ -.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $ +: .\" $XdotOrg: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $ +.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.4 2003/06/12 14:12:27 eich Exp $ .\" .\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\" .\" Permission to use, copy, modify, distribute, and sell this software and its diff --git a/src/cursor.c b/src/cursor.c index 9b14ce2..2dd8d19 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/cursor.c,v 1.5 2003/01/26 03:22:42 eich Exp $ + * $XFree86: xc/lib/Xcursor/cursor.c,v 1.4 2002/11/23 02:34:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/display.c b/src/display.c index 1f41a57..ca91c01 100644 --- a/src/display.c +++ b/src/display.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/display.c,v 1.6 2003/02/20 03:13:50 dawes Exp $ + * $XFree86: xc/lib/Xcursor/display.c,v 1.5 2002/11/27 05:35:10 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/file.c,v 1.2 2002/09/18 17:11:42 tsi Exp $ + * $XFree86: xc/lib/Xcursor/file.c,v 1.1tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/library.c b/src/library.c index b359c45..3367a85 100644 --- a/src/library.c +++ b/src/library.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/library.c,v 1.4 2003/11/11 01:17:54 dawes Exp $ + * $XFree86: xc/lib/Xcursor/library.c,v 1.3 2003/11/07 17:56:02 dawes Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xcursorint.h b/src/xcursorint.h index 5d4a2f2..97407fe 100644 --- a/src/xcursorint.h +++ b/src/xcursorint.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/xcursorint.h,v 1.4 2003/01/26 03:22:42 eich Exp $ + * $XFree86: xc/lib/Xcursor/xcursorint.h,v 1.3 2002/11/23 02:34:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/xlib.c,v 1.4 2003/02/22 06:16:15 dawes Exp $ + * $XFree86: xc/lib/Xcursor/xlib.c,v 1.3 2002/11/23 02:34:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * |