Ignore:
Timestamp:
11/03/2023 08:46:15 AM (12 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
lazarus
Children:
167c050
Parents:
3e86dee (diff), 3a725a3 (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

  • networking/netutils/wireshark.xml

    r3e86dee refec285  
    77  <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.xz">
    88  <!ENTITY wireshark-download-ftp  " ">
    9   <!ENTITY wireshark-md5sum        "8290f8a148de88665ecbf745a14f2916">
     9  <!ENTITY wireshark-md5sum        "29d710e0cf96e26005bd13b9d1cd9384">
    1010  <!ENTITY wireshark-size          "41 MB">
    11   <!ENTITY wireshark-buildsize     "849 MB (with all optional dependencies available in the BLFS book)">
    12   <!ENTITY wireshark-time          "2.0 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
     11  <!ENTITY wireshark-buildsize     "822 MB (with all optional dependencies available in the BLFS book)">
     12  <!ENTITY wireshark-time          "2.3 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
    1313]>
    1414
Note: See TracChangeset for help on using the changeset viewer.