Changeset 73ace20 for BOOK/general.ent


Ignore:
Timestamp:
Oct 10, 2012, 6:42:21 PM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f7b2c72
Parents:
0cce40d (diff), 80cbd64 (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' of git.cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r0cce40d r73ace20  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "12"> <!-- Use two digits -->
    4 <!ENTITY month_name "December">
    5 <!ENTITY day "10"> <!-- Use two digits -->
    6 <!ENTITY year "2011"> <!-- Use four digits -->
     3<!ENTITY month "09"> <!-- Use two digits -->
     4<!ENTITY month_name "August">
     5<!ENTITY day "19"> <!-- Use two digits -->
     6<!ENTITY year "2012"> <!-- Use four digits -->
    77
    88<!ENTITY releasedate "&month_name; &day;, &year;">
    99
    10 <!ENTITY major-version "1">
    11 <!ENTITY minor-version "2">
     10<!ENTITY major-version "2">
     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.