Changeset 2b687ad for BOOK/general.ent


Ignore:
Timestamp:
Feb 10, 2011, 5:04:43 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
8050e8b
Parents:
e59e934 (diff), 6d1db7d (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.
git-author:
Joe Ciccone <jciccone@…> (02/10/11 16:52:13)
git-committer:
Joe Ciccone <jciccone@…> (02/10/11 17:04:43)
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/general.ent
BOOK/introduction/common/changelog.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    re59e934 r2b687ad  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "01"> <!-- Use two digits -->
    4 <!ENTITY month_name "February">
    5 <!ENTITY day "06"> <!-- Use two digits -->
     3<!ENTITY month "02"> <!-- Use two digits -->
     4<!ENTITY month_name "Feburary">
     5<!ENTITY day "10"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77
Note: See TracChangeset for help on using the changeset viewer.