Changeset 2b687ad for BOOK/patches.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/patches.ent

    re59e934 r2b687ad  
    5656<!ENTITY procps-ps_cgroup-patch-md5 "3c478ef88fad23353e332b1b850ec630">
    5757<!ENTITY procps-ps_cgroup-patch-size "4 KB">
     58
     59<!ENTITY procps-fix_HZ_errors-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
     60<!ENTITY procps-fix_HZ_errors-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">
     61<!ENTITY procps-fix_HZ_errors-patch-size "4 KB">
    5862
    5963<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
Note: See TracChangeset for help on using the changeset viewer.