Changeset 1be8fad for packages.ent

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:

• packages.ent (modified) (3 diffs)

packages.ent

@@ -44 +44 @@
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "5.11.1">
+<!ENTITY btrfs-progs-version          "5.12">
 <!ENTITY dosfstools-version           "4.2">
 <!ENTITY fuse3-version                "3.10.2">
@@ -99 +99 @@
 <!ENTITY gcab-version                 "0.7">
 <!ENTITY glib2-minor                  "2.68">
-<!ENTITY glib2-version                "&glib2-minor;.1">
+<!ENTITY glib2-version                "&glib2-minor;.2">
 <!ENTITY glibmm-version               "2.66.0">
 <!ENTITY gmime-version                "2.6.23">
@@ -744 +744 @@
 <!ENTITY gtk2-version                 "2.24.33">
 <!ENTITY gtk3-version                 "3.24.29">
-<!ENTITY gtk4-version                 "4.2.0">
+<!ENTITY gtk4-version                 "4.2.1">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.5">