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/introduction/common/changelog.xml

    rf33b74f r4ce7c10  
    3737-->
    3838
     39    <listitem>
     40      <para>January 8, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Update Util-Linux to 2.19-rc3.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
    3947
    4048    <listitem>
Note: See TracChangeset for help on using the changeset viewer.