Changeset 1718e20 for BOOK/patches.ent


Ignore:
Timestamp:
May 23, 2011, 3:04:49 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
cfb2026a
Parents:
30a199c (diff), 1ac2d0c (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/final-system/common/kbd.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/patches.ent

    r30a199c r1718e20  
    4444<!ENTITY iputils-doc-patch-md5 "2eee5e095005bf4be426797a4aefa27b">
    4545<!ENTITY iputils-doc-patch-size "136 KB">
     46
     47<!ENTITY kbd-espo-patch "kbd-&kbd-version;-es.po_fix-1.patch">
     48<!ENTITY kbd-espo-patch-md5 "476c4066c5c663b44b67acaa4cdef62e">
     49<!ENTITY kbd-espo-patch-size "1 KB">
    4650
    4751<!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
Note: See TracChangeset for help on using the changeset viewer.