Ignore:
Timestamp:
Jan 30, 2011, 10:12:16 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
5765b29
Parents:
4ce7c10 (diff), 275bc81 (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

Location:
BOOK/final-system/multilib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/procps-64bit.xml

    r4ce7c10 rd2759bb  
    2121  <sect2 role="installation">
    2222    <title>Installation of Procps</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/procps.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    href="../common/procps.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/final-system/multilib/procps-n32.xml

    r4ce7c10 rd2759bb  
    2222  <sect2 role="installation">
    2323    <title>Installation of Procps</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    href="../common/procps.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     30    href="../common/procps.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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

    r4ce7c10 rd2759bb  
    2222  <sect2 role="installation">
    2323    <title>Installation of Procps</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    href="../common/procps.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     30    href="../common/procps.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Note: See TracChangeset for help on using the changeset viewer.