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/final-system/multilib/iproute2.xml

    r5c8e74d r350ab24  
    2929    href="../common/iproute2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
    31    
     31
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/iproute2.xml"
    3434    xpointer="xpointer(//*[@os='f1'])"/>
    35    
     35
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    href="../common/iproute2.xml"
Note: See TracChangeset for help on using the changeset viewer.