Changeset 150ed37


Ignore:
Timestamp:
May 29, 2014, 7: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

Location:
BOOK
Files:
2 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>
  • BOOK/packages.ent

    rd3a81ee r150ed37  
    307307<!ENTITY man-db-md5 "ce7b697f8e8016a085d9f5975ae6c4fb">
    308308
    309 <!ENTITY man-pages-version "3.67">
    310 <!ENTITY man-pages-size "1,248 KB">
     309<!ENTITY man-pages-version "3.68">
     310<!ENTITY man-pages-size "1,254 KB">
    311311<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
    312 <!ENTITY man-pages-md5 "5629dae00ef93658ada9226aa33b51b6">
     312<!ENTITY man-pages-md5 "43965ed65b34aeff75767b162f97eb01">
    313313<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
    314314
     
    421421<!ENTITY tcl-home "http://www.tcl.tk">
    422422
    423 <!ENTITY tzdata-version "2014c">
     423<!ENTITY tzdata-version "2014d">
    424424<!ENTITY tzdata-size "221 KB">
    425425<!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
    426 <!ENTITY tzdata-md5 "fa7f3dc1c6f6238253a6f2b850467e2e">
     426<!ENTITY tzdata-md5 "299b86c0368ecfb321f15d5c408a1d9b">
    427427<!ENTITY tzdata-home "http://www.iana.org/time-zones">
    428428
Note: See TracChangeset for help on using the changeset viewer.