Ignore:
Timestamp:
06/16/2021 03:45:12 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
6e9ca99
Parents:
6a72404 (diff), 7fe99c2 (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:

Automatic merge of trunk into multilib

File:
1 edited

Legend:

Unmodified
Added
Removed

  • chapter08/chapter08.xml

    r6a72404 rdd79d3f  
    8080  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
    8181  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
    82   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    8382  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
    8483  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
    … …  
    9392
    9493  <!-- Both sysv on systemd builds -->
     94  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    9595  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    9696  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
Note: See TracChangeset for help on using the changeset viewer.