Ignore:
Timestamp:
May 21, 2014, 5:15:23 PM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
d8d2f8c
Parents:
8ba6ad8 (diff), db4106c (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' of git.cross-lfs.org:cross-lfs

Conflicts:

BOOK/introduction/common/changelog.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    r8ba6ad8 rd67b65d  
    4646          <para>[Chris] - Moved creation of /etc/fstab to system-config.</para>
    4747        </listitem>
     48        <listitem>
     49          <para>[William Harrington] - Update Man-pages to 3.67.</para>
     50        </listitem>
    4851      </itemizedlist>
    4952    </listitem>
Note: See TracChangeset for help on using the changeset viewer.