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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
Note: See TracChangeset for help on using the changeset viewer.