diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:55 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:55 +0000 |
| commit | b3d2a9cbcf27659b04eb0088c02de753dc43d5a8 (patch) | |
| tree | 6a5cf111232b8e587e2d67e06fbbd743d5be19f2 | |
| parent | 1892f06c354c1b37308a5adc35cf6a4343148871 (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGElg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP
| -rw-r--r-- | include/X11/extensions/XvMClib.h | 3 | ||||
| -rw-r--r-- | src/XvMC.c | 2 | ||||
| -rw-r--r-- | src/XvMClibint.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/X11/extensions/XvMClib.h b/include/X11/extensions/XvMClib.h index 16b009d..bc8d7cc 100644 --- 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_ @@ -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 --- 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 |