DRI XFree86-4_3_99_12-merge import

Merging XORG-CURRENT into trunk
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2026-03-24 09:35:42 +00:00 · 2004-06-16 09:24:09 +00:00 · 2004-04-23 19:52:24 +00:00 · 2004-03-14 08:33:41 +00:00 · 2004-03-03 12:12:28 +00:00 · 2004-02-26 13:35:55 +00:00
1 changed files with 2 additions and 2 deletions
--- 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.30 2002/05/14 20:19:53 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.31 2003/07/16 01:38:47 dawes Exp $ */

 #include "videodev.h"
 #include "xf86.h"
@@ -13,7 +13,7 @@
 #include "xf86fbman.h"
 #include "xf86xv.h"
 #include "Xv.h"
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "dgaproc.h"
 #include "xf86str.h"
Author	SHA1	Message	Date
Eric Anholt	b299863dd2	DRI XFree86-4_3_99_12-merge import	2004-06-16 09:24:09 +00:00
Egbert Eich	1f8ceb0991	Merging XORG-CURRENT into trunk	2004-04-23 19:52:24 +00:00
Egbert Eich	fb4a148b6e	Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004	2004-03-14 08:33:41 +00:00
Egbert Eich	abaaf69833	Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004	2004-03-03 12:12:28 +00:00
Egbert Eich	bd8c0455c2	readding XFree86's cvs IDs	2004-02-26 13:35:55 +00:00
Egbert Eich	9c34b95344	Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004	2004-02-26 09:23:28 +00:00
Egbert Eich	871d6d6aef	Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004	2004-01-29 08:08:41 +00:00
Kaleb Keithley	e8bf6a26c8	XFree86 4.3.99.902 (RC 2)	2003-12-19 20:55:19 +00:00
Kaleb Keithley	0fc7fdb71a	XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks	2003-11-25 19:28:43 +00:00
Kaleb Keithley	1c98a4f36f	XFree86 4.3.0.1	2003-11-14 16:48:55 +00:00