Ignore:
Timestamp:
12/04/2021 08:32:42 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
104ff4e
Parents:
ce5723af (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 qt5new

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general/prog/openjdk.xml

    rce5723af r1daaab6d  
    152152      </listitem>
    153153    </itemizedlist>
    154 <!-- 
     154<!--
    155155    <bridgehead renderas="sect4">Required patch</bridgehead>
    156156
    … …  
    317317      </para>
    318318    </note>
    319  
     319
    320320    <para>
    321321      There are now two <application>OpenJDK</application> SDKs installed
Note: See TracChangeset for help on using the changeset viewer.