Ignore:
Timestamp:
Jun 11, 2014, 8:36:53 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
90eb968
Parents:
3acf8711 (diff), 6652815 (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

    r3acf8711 rd0258bc  
    4646    </listitem>
    4747
     48
     49    <listitem>
     50      <para>10 June 2014</para>
     51      <itemizedlist>
     52        <listitem>
     53          <para>[William Harrington] - Upgraded Gettext to 0.19.1.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
    4858    <listitem>
    4959      <para>04 June 2014</para>
Note: See TracChangeset for help on using the changeset viewer.