Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.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/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/mips64-64/changelog.xml

    rec008670 r229ed25  
    3333
    3434-->
    35 
    3635    <listitem>
    37       <para>June 02, 2008</para>
     36      <para>24 October 2013</para>
    3837      <itemizedlist>
    3938        <listitem>
    40           <para>[ken] - create libstdc++.so symlinks in /usr/lib64 so that the
    41           glibc and ld tests all link, and delete them safely before installing
    42           binutils.</para>
    43           <para>[ken] - ensure binutils does not install libiberty.a into
    44           /usr/lib64.</para>
     39          <para>[William Harrington] - Changelog restarted, see the 2.1.0 book for the old changelog.</para>
    4540        </listitem>
    4641      </itemizedlist>
    4742    </listitem>
    48 
    49     <listitem>
    50       <para>November 21, 2006</para>
    51       <itemizedlist>
    52         <listitem>
    53           <para>[jim] - Updated to Colo 1.22.</para>
    54         </listitem>
    55       </itemizedlist>
    56     </listitem>
    57 
    58     <listitem>
    59       <para>October 26, 2006</para>
    60       <itemizedlist>
    61         <listitem>
    62           <para>[jim] - Added patch to Glibc 2.5, to fix an issue of a missing ldd-rewrite.sed.</para>
    63         </listitem>
    64       </itemizedlist>
    65     </listitem>
    66 
    67     <listitem>
    68       <para>August 28, 2006</para>
    69       <itemizedlist>
    70         <listitem>
    71           <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
    72         </listitem>
    73       </itemizedlist>
    74     </listitem>
    75 
    7643  </itemizedlist>
    7744
Note: See TracChangeset for help on using the changeset viewer.