Changeset d67b65d


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

Location:
BOOK
Files:
2 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>

  • BOOK/packages.ent

    r8ba6ad8 rd67b65d  
    344344<!ENTITY man-db-md5 "ce7b697f8e8016a085d9f5975ae6c4fb">
    345345
    346 <!ENTITY man-pages-version "3.66">
    347 <!ENTITY man-pages-size "1,239 KB">
     346<!ENTITY man-pages-version "3.67">
     347<!ENTITY man-pages-size "1,248 KB">
    348348<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
    349 <!ENTITY man-pages-md5 "4400766c63a28e58bb899a2d3a0191d8">
     349<!ENTITY man-pages-md5 "5629dae00ef93658ada9226aa33b51b6">
    350350<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
    351351
Note: See TracChangeset for help on using the changeset viewer.