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

    rec008670 r229ed25  
    3333
    3434-->
    35 
    3635    <listitem>
    37       <para>July 13, 2008</para>
     36      <para>24 October 2013</para>
    3837      <itemizedlist>
    3938        <listitem>
    40           <para>[jciccone] - Bump the Linux Alpha PAGE_SIZE patch to -2.</para>
    41          </listitem>
    42       </itemizedlist>
    43     </listitem>
    44 
    45     <listitem>
    46       <para>Janurary 6, 2007</para>
    47       <itemizedlist>
    48         <listitem>
    49           <para>[jciccone] - Add a sed to the kernel build that removes -Werror
    50           from a specific part of the build.</para>
    51         </listitem>
    52       </itemizedlist>
    53     </listitem>
    54 
    55     <listitem>
    56       <para>Janurary 1, 2007</para>
    57       <itemizedlist>
    58         <listitem>
    59           <para>[jciccone] - Update the aboot patch so that it builds again.</para>
    60         </listitem>
    61       </itemizedlist>
    62     </listitem>
    63 
    64     <listitem>
    65       <para>December 23, 2007</para>
    66       <itemizedlist>
    67         <listitem>
    68           <para>[jciccone] - Added a patch to the Kernel that makes the
    69           PAGE_SIZE definition available in userspace.</para>
    70         </listitem>
    71       </itemizedlist>
    72     </listitem>
    73 
    74     <listitem>
    75       <para>December 21, 2007</para>
    76       <itemizedlist>
    77         <listitem>
    78           <para>[jciccone] - Added a patch to Glibc that works around compile
    79           errors with PTR_MANGLE.</para>
    80         </listitem>
    81       </itemizedlist>
    82     </listitem>
    83 
    84     <listitem>
    85       <para>February 17, 2007</para>
    86       <itemizedlist>
    87         <listitem>
    88           <para>[jciccone] - Added a patch that adds sigsuspend_nocancel
    89           support to Glibc.</para>
    90         </listitem>
    91       </itemizedlist>
    92     </listitem>
    93 
    94     <listitem>
    95       <para>August 28, 2006</para>
    96       <itemizedlist>
    97         <listitem>
    98           <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog..</para>
     39          <para>[William Harrington] - Changelog restarted, see the 2.1.0 book for the old changelog.</para>
    9940        </listitem>
    10041      </itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.