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/alpha/eglibc.xml

    raf43a09 r2643b9b4  
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    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"
     37    href="../common/eglibc.xml"
    3038    xpointer="xpointer(//*[@os='l3'])"/>
    3139
    … …  
    3341    href="../common/eglibc.xml"
    3442    xpointer="xpointer(//*[@os='l4'])"/>
     43
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/eglibc.xml"
     46    xpointer="xpointer(//*[@os='p1'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/eglibc.xml"
     50    xpointer="xpointer(//*[@os='p2'])"/>
    3551
    3652    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.