Changeset 350ab24 for BOOK/general.ent


Ignore:
Timestamp:
Apr 28, 2014, 8:56:46 PM (11 years ago)
Author:
Chris Staub <chris@…>
Parents:
5c8e74d (diff), 31cfd067 (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:

Merged latest systemd branch changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r5c8e74d r350ab24  
    33<!ENTITY month "04"> <!-- Use two digits -->
    44<!ENTITY month_name "April">
    5 <!ENTITY day "20"> <!-- Use two digits -->
     5<!ENTITY day "28"> <!-- 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">
    13 <!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
     13<!ENTITY generic-version "systemd"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
    1414
    1515<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
Note: See TracChangeset for help on using the changeset viewer.