Ignore:
Timestamp:
Oct 16, 2012, 9:32:25 PM (13 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
2a8ab07
Parents:
73ace20 (diff), 83c5afd (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' of git.cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/alpha-chapter.xml

    r73ace20 rf7b2c72  
    3333  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
    3434  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
     35  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    3536  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
    3637  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
    … …  
    6465  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
    6566  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    66   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    6767  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
    6868  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
Note: See TracChangeset for help on using the changeset viewer.