Ignore:
Timestamp:
07/18/2024 03:39:36 PM (2 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
12.2, gimp3, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128
Children:
62032e7
Parents:
9b07fbf6 (diff), ad8b716 (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:

Bring bimp3 branch up to date with trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/genlib.xml

    r9b07fbf6 rc2c16bab  
    102102  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
    103103  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
    104   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgrss.xml"/>
     104<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgrss.xml"/>-->
    105105  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
    106106  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
     
    171171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-llvm-translator.xml"/>
    172172  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
    173   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
     173<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>-->
    174174  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uchardet.xml"/>
    175175  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="umockdev.xml"/>
Note: See TracChangeset for help on using the changeset viewer.