Ignore:
Timestamp:
Apr 23, 2011, 10:54:25 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
5f27dfa
Parents:
2643b9b4 (diff), 2a31285 (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-chapter.xml

    r2643b9b4 r441840b  
    106106  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
    107107  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     108  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     109  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
     110  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     111  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     112  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
     113  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    108114  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    109115  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
Note: See TracChangeset for help on using the changeset viewer.