summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:50 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:50 +0000
commitcb9c424420f3eb53f4b57f72df3ef9e62bb22c69 (patch)
treeabb02ccce8f81bf33bc49f111e88a370d1028fd0
parentdfee8a2321bf8c77a14ffbc4a74e11dff7fdb54c (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--man/penmount.man2
-rw-r--r--src/xf86PM.c2
-rw-r--r--src/xf86PM.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/man/penmount.man b/man/penmount.man
index a51ac80..b247648 100644
--- a/man/penmount.man
+++ b/man/penmount.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/penmount.man,v 1.3 2001/08/17 13:27:57 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH PENMOUNT __drivermansuffix__ __vendorversion__
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 2e89b90..2dcea2d 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -28,7 +28,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.c,v 1.3 2001/11/26 16:25:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.c,v 1.2 2000/08/11 19:10:46 dawes Exp $ */
#define _PENMOUNT_C_
diff --git a/src/xf86PM.h b/src/xf86PM.h
index 93757d9..844ecf9 100644
--- a/src/xf86PM.h
+++ b/src/xf86PM.h
@@ -27,7 +27,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.h,v 1.1 2000/08/01 18:59:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.h,v 1.2 1999/08/22 05:57:37 dawes Exp $ */
#ifndef _PENMOUNT_H_
#define _PENMOUNT_H_