Merging XORG-CURRENT into trunk

diff --git a/Xv.h b/Xv.h
index a6a0271..4e85fa7 100644 (file)
--- a/Xv.h
+++ b/Xv.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xv.h,v 1.5 1999/12/11 19:28:48 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/Xv.h,v 1.3 1999/05/23 06:33:22 dawes Exp $ */
 
 #ifndef XV_H
 #define XV_H

diff --git a/XvMC.h b/XvMC.h
index f40c07f..03efcd7 100644 (file)
--- a/XvMC.h
+++ b/XvMC.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/XvMC.h,v 1.8 2002/01/16 01:15:45 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/XvMC.h,v 1.7 2001/11/14 21:54:37 mvojkovi Exp $ */
 
 #ifndef _XVMC_H_
 #define _XVMC_H_

diff --git a/XvMCproto.h b/XvMCproto.h
index f02814a..46ce41f 100644 (file)
--- a/XvMCproto.h
+++ b/XvMCproto.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/XvMCproto.h,v 1.5 2001/11/14 21:54:37 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/XvMCproto.h,v 1.4 2001/04/10 00:28:24 mvojkovi Exp $ */
 
 #ifndef _XVMCPROTO_H_
 #define _XVMCPROTO_H_

diff --git a/Xvproto.h b/Xvproto.h
index b4d8f22..9112f51 100644 (file)
--- a/Xvproto.h
+++ b/Xvproto.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xvproto.h,v 1.6 2001/05/07 21:37:12 tsi Exp $ */
+/* $XFree86: xc/include/extensions/Xvproto.h,v 1.5 2000/01/25 00:08:07 mvojkovi Exp $ */
 
 #ifndef XVPROTO_H
 #define XVPROTO_H