Ignore:
Timestamp:
09/28/2022 10:34:01 AM (19 months ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal
Children:
3d48ae4
Parents:
5fe69261 (diff), 87065037 (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 plabs/python-mods

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/libbytesize.xml

    r5fe69261 r1ff0f0c  
    7878    </para>
    7979
     80    <bridgehead renderas="sect4">Recommended</bridgehead>
     81
     82    <para role="recommended">
     83      <xref linkend="six"/>
     84    </para>
     85
    8086    <bridgehead renderas="sect4">Optional</bridgehead>
    8187    <para role="optional">
    8288      <xref linkend="gtk-doc"/>,
    83       <xref linkend="six"/> (needed for tests, python bindings, and running
    84       <command>bscalc</command>),
     89      <!--<xref linkend="six"/> (needed for tests, python bindings, and running
     90      <command>bscalc</command>),-->
    8591      <ulink url="https://github.com/rhinstaller/pocketlint/releases">pocketlint</ulink> (python module for one test), and
    8692      <ulink url="https://pypi.python.org/pypi/polib">polib</ulink> (python module for one test)
Note: See TracChangeset for help on using the changeset viewer.