Commit git's silly merging

This commit is contained in:
Bruce Dubbs 2021-05-07 13:54:26 -05:00
commit bd58604c50
3 changed files with 4 additions and 4 deletions

View File

@ -64,7 +64,7 @@
<ulink url="&blfs-ticket-root;14758">#14758</ulink>.</para> <ulink url="&blfs-ticket-root;14758">#14758</ulink>.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>[timtas] - Update to thunar-4.16.7. Fixes <para>[timtas] - Update to thunar-4.16.8. Fixes
<ulink url="&blfs-ticket-root;15003">#15003</ulink>.</para> <ulink url="&blfs-ticket-root;15003">#15003</ulink>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

View File

@ -832,7 +832,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY exo-version "4.16.2"> <!ENTITY exo-version "4.16.2">
<!ENTITY garcon-minor "4.16"> <!ENTITY garcon-minor "4.16">
<!ENTITY garcon-version "4.16.1"> <!ENTITY garcon-version "4.16.1">
<!ENTITY thunar-version "4.16.7"> <!ENTITY thunar-version "4.16.8">
<!ENTITY thunar-volman-version "4.16.0"> <!ENTITY thunar-volman-version "4.16.0">
<!ENTITY tumbler-version "4.16.0"> <!ENTITY tumbler-version "4.16.0">
<!ENTITY xfce4-appfinder-version "4.16.1"> <!ENTITY xfce4-appfinder-version "4.16.1">

View File

@ -7,8 +7,8 @@
<!ENTITY thunar-download-http <!ENTITY thunar-download-http
"https://archive.xfce.org/src/xfce/thunar/&xfce4-version;/thunar-&thunar-version;.tar.bz2"> "https://archive.xfce.org/src/xfce/thunar/&xfce4-version;/thunar-&thunar-version;.tar.bz2">
<!ENTITY thunar-download-ftp " "> <!ENTITY thunar-download-ftp " ">
<!ENTITY thunar-md5sum "c12a3ad75ea8fc644321e46968778668"> <!ENTITY thunar-md5sum "7bdf84a1eb6bf7a033cf4df031e8715d">
<!ENTITY thunar-size "2.5 MB"> <!ENTITY thunar-size "2.4 MB">
<!ENTITY thunar-buildsize "53 MB"> <!ENTITY thunar-buildsize "53 MB">
<!ENTITY thunar-time "0.5 SBU"> <!ENTITY thunar-time "0.5 SBU">
]> ]>