Ignore:
Timestamp:
Jan 29, 2011, 4:28:46 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d2759bb
Parents:
f33b74f (diff), 9fedd70f (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 systemd

Conflicts:

BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rf33b74f r4ce7c10  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
    41   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    42   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
    4343  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
    4444  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
Note: See TracChangeset for help on using the changeset viewer.