Ignore:
Timestamp:
Apr 16, 2011, 5:46:52 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
441840b
Parents:
af43a09 (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 simp

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    raf43a09 r2643b9b4  
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='l1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='l2'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/eglibc.xml"
    3139    xpointer="xpointer(//*[@os='l3'])"/>
    3240
    … …  
    3442    href="../common/eglibc.xml"
    3543    xpointer="xpointer(//*[@os='l4'])"/>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../common/eglibc.xml"
     47    xpointer="xpointer(//*[@os='p1'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../common/eglibc.xml"
     51    xpointer="xpointer(//*[@os='p2'])"/>
    3652
    3753    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.