diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | 85c22297dbc9d0ddc5c3dcf0244ed18799a559c1 (patch) | |
| tree | 8066eb1d83ed7558f90af2210bfdf277460b94e8 | |
| parent | 9a9f4da9e75f96b2b41c312bc47a832efc9304f7 (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-CURRENTXACE-SELINUXDAMAGE-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-- | xf86vmode.h | 2 | ||||
| -rw-r--r-- | xf86vmstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xf86vmode.h b/xf86vmode.h index 99e6323..3420ae4 100644 --- a/xf86vmode.h +++ b/xf86vmode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY diff --git a/xf86vmstr.h b/xf86vmstr.h index db6f6e6..a80eb8e 100644 --- a/xf86vmstr.h +++ b/xf86vmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY |