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
  • appendices/glossary.xml

    rce5723af r1daaab6d  
    12181218        <para>
    12191219          <acronym>JPEG</acronym> File Interchange Format
    1220        
    12211220        </para>
    12221221      </glossdef>
     
    21442143        <para>
    21452144          Secure/<acronym>MIME</acronym>
    2146        
    21472145        </para>
    21482146      </glossdef>
Note: See TracChangeset for help on using the changeset viewer.