Changeset 1be8fad for general


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/glib2.xml

    r4b1b4784 r1be8fad  
    77  <!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
    88  <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
    9   <!ENTITY glib2-md5sum        "bc9f2250be1f773bb17747d3b2e6a3ae">
    10   <!ENTITY glib2-size          "4.8 MB">
    11   <!ENTITY glib2-buildsize     "178 MB (add 5 MB for tests)">
    12   <!ENTITY glib2-time          "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)">
     9  <!ENTITY glib2-md5sum        "8d288416da38476c71998e5c2d3602ed">
     10  <!ENTITY glib2-size          "4.7 MB">
     11  <!ENTITY glib2-buildsize     "209 MB (add 6 MB for tests)">
     12  <!ENTITY glib2-time          "0.5 SBU (add 0.5 SBU for tests; both using parallelism=4)">
    1313]>
    1414
Note: See TracChangeset for help on using the changeset viewer.