diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:39 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:39 +0000 |
| commit | 89c188f5b2381eae8309dc1ce093555ca714d138 (patch) | |
| tree | bae893bd92f310c1c2294b4dbe03e18ca1b71d33 | |
| parent | 11fe587203112188c45a17a2f724fc202a0c9493 (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-- | README | 2 | ||||
| -rw-r--r-- | man/v4l.man | 2 | ||||
| -rw-r--r-- | src/v4l.c | 2 | ||||
| -rw-r--r-- | src/videodev.h | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -34,4 +34,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $ diff --git a/man/v4l.man b/man/v4l.man index 5337112..38014b7 100644 --- a/man/v4l.man +++ b/man/v4l.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH V4L __drivermansuffix__ __vendorversion__ @@ -2,7 +2,7 @@ * video4linux Xv Driver * based on Michael Schimek's permedia 2 driver. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */ #include "videodev.h" #include "xf86.h" diff --git a/src/videodev.h b/src/videodev.h index 77b592e..1d6991e 100644 --- a/src/videodev.h +++ b/src/videodev.h @@ -7,7 +7,7 @@ * Used here with the explicit permission of the original author, Alan Cox. * <alan@lxorguk.ukuu.org.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */ #include "Xmd.h" |