Changeset 1ab9a96 for BOOK/patches.ent


Ignore:
Timestamp:
05/17/14 08:41:51 (10 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
3205da5
Parents:
b4badbd (diff), 156c0fe (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:

Fix conflicts with merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/patches.ent

    rb4badbd r1ab9a96  
    1414<!ENTITY binutils-branch_update-patch-size "5,268 KB">
    1515-->
     16
     17<!ENTITY bootscripts-clfs-tools_updates-patch "bootscripts-cross-lfs-&bootscripts-clfs-version;-tools_updates-1.patch">
     18<!ENTITY bootscripts-clfs-tools_updates-patch-md5 "9bbc4c0d5caed7f50be7ac5ea2897e3f">
     19<!ENTITY bootscripts-clfs-tools_updates-patch-size "18.718 KB">
    1620
    1721<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
Note: See TracChangeset for help on using the changeset viewer.