Ignore:
Timestamp:
12/04/2021 03:28:15 PM (2 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
lazarus
Children:
e6974d1
Parents:
b22e4ceb (diff), edd2feb7 (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:

Merge branch 'trunk' into lazarus

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general/genutils/genutils.xml

    rb22e4ceb r8307474  
    1919  </para>
    2020
     21<!--
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
    22 
     23-->
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
    2425
    … …  
    3839  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
    3940  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
    40   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
     41  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>-->
    4142  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>
Note: See TracChangeset for help on using the changeset viewer.