Changeset c9fc7ab for BOOK


Ignore:
Timestamp:
May 26, 2014, 12:16:33 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
48dab198
Parents:
0666dec (diff), 9ddcd0f (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

Location:
BOOK
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r0666dec rc9fc7ab  
    33<!ENTITY month "05"> <!-- Use two digits -->
    44<!ENTITY month_name "May">
    5 <!ENTITY day "24"> <!-- Use two digits -->
     5<!ENTITY day "25"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    r0666dec rc9fc7ab  
    3838
    3939    <listitem>
     40      <para>25 May 2014</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[William Harrington] - Upgrade Grep to 2.19.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
    4049      <para>24 May 2014</para>
    4150      <itemizedlist>

  • BOOK/packages.ent

    r0666dec rc9fc7ab  
    221221<!ENTITY gperf-home "&gnu-software;gperf">
    222222
    223 <!ENTITY grep-version "2.18">
    224 <!ENTITY grep-size "1,213 KB">
     223<!ENTITY grep-version "2.19">
     224<!ENTITY grep-size "1,235 KB">
    225225<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
    226 <!ENTITY grep-md5 "7439f8266f50844b56cc3e2721606541">
     226<!ENTITY grep-md5 "ac732142227d9fe9567d71301e127979">
    227227<!ENTITY grep-home "&gnu-software;grep">
    228228
Note: See TracChangeset for help on using the changeset viewer.