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 | 0b7ecc136225bee432954f12809ab6339a69493f (patch) | |
| tree | 169669a985cd3e67d80793f9557c036476db7783 /src/Xvlibint.h | |
| parent | 92305cda4243e4aa364418a7ebe93eca3019f77b (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-BASE
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).
Diffstat (limited to 'src/Xvlibint.h')
| -rw-r--r-- | src/Xvlibint.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Xvlibint.h b/src/Xvlibint.h index 2cec968..501a211 100644 --- a/src/Xvlibint.h +++ b/src/Xvlibint.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.6 2002/10/16 00:37:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.5 2001/07/25 15:04:53 dawes Exp $ */ #ifndef XVLIBINT_H #define XVLIBINT_H |