Changeset 7a352da8 for BOOK/general.ent


Ignore:
Timestamp:
Sep 5, 2014, 2:37:25 PM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
5898fbf
Parents:
95835e7 (diff), 234b86a (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/general.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r95835e7 r7a352da8  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "09"> <!-- Use two digits -->
    4 <!ENTITY month_name "September">
    5 <!ENTITY day "04"> <!-- Use two digits -->
     3<!ENTITY month "08"> <!-- Use two digits -->
     4<!ENTITY month_name "August">
     5<!ENTITY day "29"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77
Note: See TracChangeset for help on using the changeset viewer.