Ignore:
Timestamp:
07/18/2023 04:51:51 PM (12 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18
Children:
6dfe4ab
Parents:
4048bc73 (diff), 5af5876 (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 lxqt

File:
1 edited

Legend:

Unmodified
Added
Removed

  • networking/connect/connect.xml

    r4048bc73 re77c478  
    3737
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
    39   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
     39  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>-->
     40  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kea.xml"/>
    4041
    4142</chapter>
Note: See TracChangeset for help on using the changeset viewer.