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/prog/python-modules.xml

    rb22e4ceb r8307474  
    3131      <listitem>
    3232        <para>
     33          <xref linkend="asciidoc"/>
     34        </para>
     35      </listitem>
     36      <listitem>
     37        <para>
    3338          <xref linkend="dbus-python"/>
    3439        </para>
     
    110115          <xref linkend="Beaker"/>
    111116        </para>
    112       </listitem> 
     117      </listitem>
    113118-->
    114119      <listitem>
     
    162167
    163168  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     169    href="asciidoc.xml"/>
     170
     171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    164172    href="dbus-python.xml"/>
    165173
Note: See TracChangeset for help on using the changeset viewer.