Changeset 9136260 for BOOK/general.ent


Ignore:
Timestamp:
Apr 25, 2014, 9:35:38 PM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
18d769e
Parents:
0c8ebac (diff), bfa06fb (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 'systemd' of git.cross-lfs.org:cross-lfs into systemd

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r0c8ebac r9136260  
    33<!ENTITY month "04"> <!-- Use two digits -->
    44<!ENTITY month_name "April">
    5 <!ENTITY day "22"> <!-- Use two digits -->
     5<!ENTITY day "24"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77
    88<!ENTITY releasedate "&month_name; &day;, &year;">
    99
    10 <!ENTITY major-version "2">
    11 <!ENTITY minor-version "2">
     10<!ENTITY major-version "3">
     11<!ENTITY minor-version "0">
    1212<!ENTITY extra-version "0">
    1313<!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
Note: See TracChangeset for help on using the changeset viewer.