diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:10 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:10 +0000 |
| commit | 3cc6f3744f7ed3d982f99ec5ad5040d5201279d9 (patch) | |
| tree | 8cf8b05e484f54c75f14d05849ddf0595818adef | |
| parent | 015b24cc6bde349e7c41ab9e2dc7327d1184d948 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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-- | defs.ent | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -1,14 +1,14 @@ -<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.37 2004/01/28 01:59:33 dawes Exp $ --> +<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.38 2004/02/17 22:32:31 dawes Exp $ --> <!-- shared entity definitions for the XFree86 documentation --> <!-- XFree86 version string --> -<!ENTITY relvers CDATA "4.3.99.903"> +<!ENTITY relvers CDATA "4.4.0"> <!ENTITY prevrelvers CDATA "4.3.0"> <!ENTITY fullrelvers CDATA "4.4.0"> <!ENTITY prevfullrelvers CDATA "4.3.0"> <!ENTITY nextfullrelvers CDATA "4.5.0"> -<!ENTITY nextfullreldate CDATA "not scheduled"> +<!ENTITY nextfullreldate CDATA "mid-late 2004"> <!ENTITY nextupdrelvers CDATA "4.4.1"> <!ENTITY srcvers CDATA "440"> <!ENTITY prevsrcvers CDATA "430"> @@ -16,9 +16,9 @@ <!ENTITY prevfullsrcvers CDATA "430"> <!ENTITY whichfullrel CDATA "seventh"> <!ENTITY whichupdaterel CDATA "none"> -<!ENTITY reltag CDATA "xf-4_3_99_903"> +<!ENTITY reltag CDATA "xf-4_4_0"> <!ENTITY relbranchtag CDATA "xf-4_4-branch"> -<!ENTITY rcnum CDATA "3"> +<!ENTITY rcnum CDATA "0"> <!-- Version of the most recent 3.3.x release --> <!ENTITY legacyvers CDATA "3.3.6"> @@ -27,23 +27,23 @@ <!ENTITY doctoolsvers CDATA "1.3.2"> <!-- utils version strings --> -<!ENTITY utilsvers CDATA "1.1.1"> +<!ENTITY utilsvers CDATA "1.1.2"> <!-- xtest version strings --> <!ENTITY xtestvers CDATA "4.0.6"> <!-- These should be set according to which snapshot/release this is --> <!ENTITY % firstsnap 'IGNORE'> -<!ENTITY % latersnap 'INCLUDE'> -<!ENTITY % snapshot 'INCLUDE'> -<!ENTITY % notsnapshot 'IGNORE'> -<!ENTITY % relcandidate 'INCLUDE'> -<!ENTITY % release 'IGNORE'> +<!ENTITY % latersnap 'IGNORE'> +<!ENTITY % snapshot 'IGNORE'> +<!ENTITY % notsnapshot 'INCLUDE'> +<!ENTITY % relcandidate 'IGNORE'> +<!ENTITY % release 'INCLUDE'> <!ENTITY % firstrel 'IGNORE'> <!ENTITY % earlyrel 'IGNORE'> <!ENTITY % laterrel 'INCLUDE'> -<!ENTITY % fullrel 'IGNORE'> -<!ENTITY % fullbinaries 'IGNORE'> +<!ENTITY % fullrel 'INCLUDE'> +<!ENTITY % fullbinaries 'INCLUDE'> <!ENTITY % updaterel 'IGNORE'> <!ENTITY % prevrelwasupdate 'IGNORE'> |