Ignore:
Timestamp:
Jan 7, 2014, 2:40:56 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
c3c06b8
Parents:
8faf5fa (diff), 117bccb (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/general.ent
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    r8faf5fa r8a1e392  
    4444          installation - needed for attr.</para>
    4545        </listitem>
     46        <listitem>
     47          <para>[William Harrington] - Update DHCPCD to 6.2.0.</para>
     48        </listitem>
     49        <listitem>
     50          <para>[William Harrington] - Update Grep to 2.16.</para>
     51        </listitem>
    4652      </itemizedlist>
    4753    </listitem>
     
    9298
    9399    <listitem>
     100      <para>01 January 2014</para>
     101      <itemizedlist>
     102        <listitem>
     103          <para>[Chris] - Added command to EGLIBC instructions to remove
     104          extraneous '.x' files from /usr/include/rpcsvc.</para>
     105        </listitem>
     106      </itemizedlist>
     107    </listitem>
     108
     109    <listitem>
    94110      <para>23 December 2013</para>
    95111      <itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.