Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    r21e442f r9793117  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>April 17, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Added libee, dependency of the new
     44          rsyslog.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[jciccone] - Added libestr, dependency of the new
     48          rsyslog.</para>
     49        </listitem>
     50      </itemizedlist>
     51    </listitem>
     52
     53    <listitem>
     54      <para>April 17, 2011</para>
     55      <itemizedlist>
     56        <listitem>
     57          <para>[jciccone] - Updated Rsyslog to 6.1.7.</para>
     58        </listitem>
     59      </itemizedlist>
     60    </listitem>
    3861
    3962    <listitem>
Note: See TracChangeset for help on using the changeset viewer.