Ignore:
Timestamp:
Oct 10, 2012, 6:42:21 PM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f7b2c72
Parents:
0cce40d (diff), 80cbd64 (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 git.cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/bootable/ppc/kernel.xml

    r0cce40d r73ace20  
    9393    href="../x86/kernel.xml"
    9494    xpointer="xpointer(//*[@os='t'])"/>
     95   
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     97    href="../x86/kernel.xml"
     98    xpointer="xpointer(//*[@os='s2'])"/>
     99
     100    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     101    href="../x86/kernel.xml"
     102    xpointer="xpointer(//*[@os='t2'])"/>
    95103
    96104    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.