Merging XORG-CURRENT into trunk

diff --git a/include/X11/extensions/XvMClib.h b/include/X11/extensions/XvMClib.h
index 16b009d..bc8d7cc 100644 (file)
--- a/include/X11/extensions/XvMClib.h
+++ b/include/X11/extensions/XvMClib.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/include/extensions/XvMClib.h,v 1.7 2003/12/18 05:48:06 dawes Exp $ */
+/* $XdotOrg: xc/include/extensions/XvMClib.h,v 1.7 2003/12/18 05:48:06 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XvMClib.h,v 1.6 2001/11/14 21:54:37 mvojkovi Exp $ */
 
 #ifndef _XVMCLIB_H_
 #define _XVMCLIB_H_

diff --git a/src/XvMC.c b/src/XvMC.c
index 10a517e..f63e278 100644 (file)
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.5 2002/10/16 00:37:33 dawes Exp $ */
+/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.4 2001/11/14 21:54:38 mvojkovi Exp $ */
 
 #define NEED_REPLIES
 

diff --git a/src/XvMClibint.h b/src/XvMClibint.h
index 77f0641..1db3924 100644 (file)
--- a/src/XvMClibint.h
+++ b/src/XvMClibint.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.5 2002/10/16 00:37:33 dawes Exp $ */
+/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.4 2001/07/25 15:04:54 dawes Exp $ */
 
 #ifndef _XVMCLIBINT_H
 #define _XVMCLIBINT_H