Changeset 8a1e392 for BOOK/general.ent


Ignore:
Timestamp:
Jan 7, 2014, 2:40:56 AM (9 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
c3c06b8
Parents:
8faf5fa (diff), 117bccb (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' into systemd

Conflicts:

BOOK/general.ent
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/general.ent

    r8faf5fa r8a1e392  
    22
    33<!ENTITY month "01"> <!-- Use two digits -->
    4 <!ENTITY month_name "December">
    5 <!ENTITY day "05"> <!-- Use two digits -->
     4<!ENTITY month_name "January">
     5<!ENTITY day "06"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77
Note: See TracChangeset for help on using the changeset viewer.