Ignore:
Timestamp:
Jan 29, 2011, 4:28:46 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d2759bb
Parents:
f33b74f (diff), 9fedd70f (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 'master' into systemd

Conflicts:

BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/materials/common/packages.xml

    rf33b74f r4ce7c10  
    520520
    521521    <varlistentry>
    522       <term>Util-linux-ng (&util-linux-ng-version;) - <token>&util-linux-ng-size;</token>:</term>
    523       <listitem>
    524         <para>Home page: <ulink url="&util-linux-ng-home;"/></para>
    525         <para>Download: <ulink url="&util-linux-ng-url;"/></para>
    526         <para>MD5 sum: <literal>&util-linux-ng-md5;</literal></para>
     522      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
     523      <listitem>
     524        <para>Home page: <ulink url="&util-linux-home;"/></para>
     525        <para>Download: <ulink url="&util-linux-url;"/></para>
     526        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
    527527      </listitem>
    528528    </varlistentry>
Note: See TracChangeset for help on using the changeset viewer.