diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
| commit | e484c0bbea8a9b5d56a6e48ab07f2a1e49e71300 (patch) | |
| tree | 6a5cf111232b8e587e2d67e06fbbd743d5be19f2 | |
| parent | 35dfdce1c014c70c3eebaf06ecb1f34bc9349794 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
| -rw-r--r-- | include/X11/extensions/XvMClib.h | 2 | ||||
| -rw-r--r-- | src/XvMC.c | 2 | ||||
| -rw-r--r-- | src/XvMClibint.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/X11/extensions/XvMClib.h b/include/X11/extensions/XvMClib.h index b7e76d5..bc8d7cc 100644 --- a/include/X11/extensions/XvMClib.h +++ b/include/X11/extensions/XvMClib.h @@ -1,5 +1,5 @@ /* $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.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 |