Ignore:
Timestamp:
May 29, 2014, 12:56:24 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
fa9b711
Parents:
d3a81ee (diff), cf479f2 (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 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit

Conflicts:

BOOK/introduction/common/changelog.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    rd3a81ee r150ed37  
    4848
    4949    <listitem>
     50      <para>28 May 2014</para>
     51      <itemizedlist>
     52        <listitem>
     53          <para>[William Harrington] - Upgrade TZData to 2014d.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[William Harrington] - Upgrade Man-pages to 3.68.</para>
     57        </listitem>
     58      </itemizedlist>
     59    </listitem>
     60
     61    <listitem>
    5062      <para>25 May 2014</para>
    5163      <itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.