Ignore:
Timestamp:
05/06/2021 08:19:12 PM (3 years ago)
Author:
Ken Moffat <ken@…>
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:
43d94d8
Parents:
685b8672 (diff), ee5db05 (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' of git.linuxfromscratch.org:blfs into trunk

Pick up changes which happened while I was preparing qtwebengine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gnome/applications/file-roller.xml

    r685b8672 r0dbcba9  
    66
    77  <!ENTITY file-roller-download-http
    8            "&gnome-download-http;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
     8           "&gnome-download-http;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
    99  <!ENTITY file-roller-download-ftp
    10            "&gnome-download-ftp;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
    11   <!ENTITY file-roller-md5sum        "41ee373818d577659980dcdaf57b772a">
    12   <!ENTITY file-roller-size          "860 KB">
     10           "&gnome-download-ftp;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
     11  <!ENTITY file-roller-md5sum        "b38c3eaea9aba5f44d2701fa23a7a0ff">
     12  <!ENTITY file-roller-size          "856 KB">
    1313  <!ENTITY file-roller-buildsize     "25 MB">
    1414  <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">
Note: See TracChangeset for help on using the changeset viewer.