Ignore:
Timestamp:
Feb 10, 2014, 9:42:33 PM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
84ed6d5
Parents:
14ac7cb (diff), 49c681d (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 'systemd' of git.cross-lfs.org:cross-lfs into systemd

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/mips/gcc.xml

    r14ac7cb r2d90b8e  
    130130    xpointer="xpointer(//*[@os='z'])"/>
    131131
     132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     133    href="../common/gcc.xml"
     134    xpointer="xpointer(//*[@os='aa'])"/>
     135
     136    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     137    href="../common/gcc.xml"
     138    xpointer="xpointer(//*[@os='ab'])"/>
     139
    132140  </sect2>
    133141
Note: See TracChangeset for help on using the changeset viewer.