Changeset 1be8fad for introduction/welcome

Timestamp:

05/11/2021 08:46:29 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.1, 11.2, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2eb6c62

Parents:

4b1b4784 (diff), 7c934e69 (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:

Fix merge conflict

File:

• introduction/welcome/changelog.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -49 +49 @@
          <para>[pierre] - Fix the pkgconfig file for lua-5.2: the library
          was -llua instead of -llua5.2.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to btrfs-progs-5.12. Fixes
+         <ulink url="&blfs-ticket-root;15021">#15021</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to gtk-4.2.1. Fixes
+         <ulink url="&blfs-ticket-root;15013">#15013</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to glib-2.68.2. Fixes
+         <ulink url="&blfs-ticket-root;15027">#15027</ulink>.</para>
        </listitem>
        <listitem>