Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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/introduction/common/changelog.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/common/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.