summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:46:53 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:46:53 +0000
commit388178c88e83bdaf731177044345ef45779c63f9 (patch)
treea291bca3b63c4979e99b4c3319b9a3c704ca240c /src
parent7a7335496b33ed9b516fddf6a86e4034ea098aa2 (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).
Diffstat (limited to 'src')
-rw-r--r--src/cursor.c2
-rw-r--r--src/display.c2
-rw-r--r--src/file.c2
-rw-r--r--src/library.c2
-rw-r--r--src/xcursorint.h2
-rw-r--r--src/xlib.c2
6 files changed, 6 insertions, 6 deletions
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.
*
diff --git a/src/file.c b/src/file.c
index 813ac28..72d3a50 100644
--- a/src/file.c
+++ b/src/file.c
@@ -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.
*
diff --git a/src/xlib.c b/src/xlib.c
index 13e2433..d22a17a 100644
--- a/src/xlib.c
+++ b/src/xlib.c
@@ -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.
*