Changeset 9793117 for BOOK/materials

Timestamp:

Apr 23, 2011, 10:52:47 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

bd31da6b

Parents:

21e442f (diff), a675f833 (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/appendices/dependencies/common.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/materials/common/packages.xml (modified) (1 diff)

BOOK/materials/common/packages.xml

@@ -331 +331 @@
 
     <varlistentry>
+      <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libee-home;"/></para>
+        <para>Download: <ulink url="&libee-url;"/></para>
+        <para>MD5 sum: <literal>&libee-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Libestr (&libestr-version;) - <token>&libestr-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libestr-home;"/></para>
+        <para>Download: <ulink url="&libestr-url;"/></para>
+        <para>MD5 sum: <literal>&libestr-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>