summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-14 08:33:41 +0000
committerEgbert Eich <eich@suse.de>2004-03-14 08:33:41 +0000
commitfb4a148b6ea5f839f418a8dc7ab0f44bd90678d1 (patch)
treec36002a20a548700fccc901705250dcc93712388
parentabaaf69833e147c48bbcc355597f4ac2f86f2774 (diff)
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1
-rw-r--r--README2
-rw-r--r--man/v4l.man2
-rw-r--r--src/v4l.c2
-rw-r--r--src/videodev.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index e40f639..a21e915 100644
--- a/README
+++ b/README
@@ -34,4 +34,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $
diff --git a/man/v4l.man b/man/v4l.man
index 38014b7..5337112 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.2 2001/01/27 18:20:55 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH V4L __drivermansuffix__ __vendorversion__
diff --git a/src/v4l.c b/src/v4l.c
index 11ff025..30a829c 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -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.33 2003/12/05 03:55:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
diff --git a/src/videodev.h b/src/videodev.h
index 1d6991e..77b592e 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.7tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
#include "Xmd.h"