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

    rec008670 r229ed25  
    3232
    3333-->
    34 
    3534    <listitem>
    36       <para>May 18, 2011</para>
     35      <para>24 October 2013</para>
    3736      <itemizedlist>
    3837        <listitem>
    39           <para>[Jonathan] - Updated Grub2 to 1.99.</para>
    40         </listitem>
    41       </itemizedlist>
    42     </listitem>
    43 
    44 
    45     <listitem>
    46       <para>July 08, 2008</para>
    47       <itemizedlist>
    48         <listitem>
    49           <para>[jciccone] - Added the 256-Byte Inode patch to Grub.</para>
    50         </listitem>
    51       </itemizedlist>
    52     </listitem>
    53 
    54     <listitem>
    55       <para>March 18, 2008</para>
    56       <itemizedlist>
    57         <listitem>
    58           <para>[jciccone] - Fixed the Glibc i586_chk patch and updated it to -2.</para>
    59         </listitem>
    60       </itemizedlist>
    61     </listitem>
    62 
    63     <listitem>
    64       <para>August 28, 2006</para>
    65       <itemizedlist>
    66         <listitem>
    67           <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
     38          <para>[William Harrington] - Changelog restarted, see the 2.1.0 book for the old changelog.</para>
    6839        </listitem>
    6940      </itemizedlist>
     
    7344
    7445</sect1>
    75 
Note: See TracChangeset for help on using the changeset viewer.