Ignore:
Timestamp:
Jan 30, 2011, 10:18:13 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
2b9f7a9
Parents:
d2759bb (diff), 5cabdc2 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/procps.xml

    rd2759bb r5765b29  
    2929    ps:</para>
    3030
    31 <screen os="p2"><userinput>patch -Np1 -i ../&procps-pc_cgroup-patch;</userinput></screen>
     31<screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
    3232
    3333    <para os="s1">The following fixes an issue with Make 3.82:</para>
Note: See TracChangeset for help on using the changeset viewer.