Ignore:
Timestamp:
Jul 25, 2009, 6:32:23 PM (15 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
2093cd5, 8376bff
Parents:
38550f6 (diff), 33bbc46 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/x86_64-64-chapter.xml

    r38550f6 r6974e6b  
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/binutils.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
    29   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    3029  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3130  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     31  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    3232  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
    3333  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
Note: See TracChangeset for help on using the changeset viewer.