Changeset 4e897cf for general.ent


Ignore:
Timestamp:
03/05/2023 10:14:49 AM (14 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib
Children:
d09e490
Parents:
d8bc5bd (diff), 73e2b9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Fix conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rd8bc5bd r4e897cf  
    88                                      set to IGNORE for development or
    99                                       release -->
    10 <!ENTITY % relnum "11.1"><!-- must be given for release or rc -->
    11 <!ENTITY % reldate "March 1st, 2022"><!-- must ve given for release or rc -->
     10<!ENTITY % relnum "11.3"><!-- must be given for release or rc -->
     11<!ENTITY % reldate "March 1st, 2023"><!-- must ve given for release or rc -->
    1212<!ENTITY % crdate "1999-2022"><!-- must ve given for release or rc -->
    13 <!ENTITY % rcnum  "2"><!-- must be given only for rc -->
     13<!ENTITY % rcnum  "0"><!-- must be given only for rc -->
    1414<!-- ================================================================== -->
    1515<!-- Do not change anything below unless the www or book layouts change -->
Note: See TracChangeset for help on using the changeset viewer.