Ignore:
Timestamp:
May 23, 2011, 3:04:49 PM (14 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/materials/common/patches.xml

    r30a199c r1718e20  
    101101
    102102    <varlistentry>
     103      <term>Kbd es.po Fix Patch - <token>&kbd-espo-patch-size;</token>:</term>
     104      <listitem>
     105        <para>Download: <ulink
     106        url="&patches-root;&kbd-espo-patch;"/></para>
     107        <para>MD5 sum: <literal>&kbd-espo-patch-md5;</literal></para>
     108      </listitem>
     109    </varlistentry>
     110
     111    <varlistentry>
    103112      <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
    104113      <listitem>
Note: See TracChangeset for help on using the changeset viewer.