Ignore:
Timestamp:
Apr 16, 2011, 5:47:06 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
9793117
Parents:
6cefbfb (diff), e0ad6ee (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' into systemd

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/mips64/eglibc-64bit.xml

    r6cefbfb r21e442f  
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2937    href="../multilib/eglibc-64bit.xml"
    3038    xpointer="xpointer(//*[@os='l4'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41    href="../common/eglibc.xml"
     42    xpointer="xpointer(//*[@os='p1'])"/>
     43
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/eglibc.xml"
     46    xpointer="xpointer(//*[@os='p2'])"/>
    3147
    3248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.