Ignore:
Timestamp:
Jun 13, 2014, 8:59:26 PM (10 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
73e033d
Parents:
d94bdd0 (diff), 4e982a0 (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' of cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/bootable/sparc/kernel.xml

    rd94bdd0 r21e76b6  
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7777    href="../x86/kernel.xml"
    78     xpointer="xpointer(//*[@os='p'])"/>
    79 
    80     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81     href="../x86/kernel.xml"
    82     xpointer="xpointer(//*[@os='q'])"/>
    83 
    84     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    85     href="../x86/kernel.xml"
    86     xpointer="xpointer(//*[@os='r'])"/>
    87 
    88     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    89     href="../x86/kernel.xml"
    9078    xpointer="xpointer(//*[@os='s'])"/>
    9179
Note: See TracChangeset for help on using the changeset viewer.