Changeset 8a1e392 for BOOK/introduction

Timestamp:

Jan 7, 2014, 2:40:56 AM (11 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:

• BOOK/introduction/common/changelog.xml (modified) (2 diffs)

BOOK/introduction/common/changelog.xml

@@ -44 +44 @@
           installation - needed for attr.</para>
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Update DHCPCD to 6.2.0.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Grep to 2.16.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
@@ -92 +98 @@
 
     <listitem>
+      <para>01 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added command to EGLIBC instructions to remove
+          extraneous '.x' files from /usr/include/rpcsvc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>23 December 2013</para>
       <itemizedlist>