Ignore:
Timestamp:
Apr 28, 2014, 8:56:46 PM (11 years ago)
Author:
Chris Staub <chris@…>
Parents:
5c8e74d (diff), 31cfd067 (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:

Merged latest systemd branch changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/bootable/ppc/kernel.xml

    r5c8e74d r350ab24  
    6565    mac-specific options for ide and input.</para>
    6666    </warning>
    67    
     67
    6868    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6969    href="../x86/kernel.xml"
    … …  
    101101    href="../x86/kernel.xml"
    102102    xpointer="xpointer(//*[@os='t'])"/>
    103    
     103
    104104    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    105105    href="../x86/kernel.xml"
Note: See TracChangeset for help on using the changeset viewer.