Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/ppc64-chapter.xml

    rec008670 r229ed25  
    1515  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
    1616  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
     17  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/util-linux-32.xml"/>
    1718  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
    1820  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
    1921  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
    2022  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
    22   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
     24  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
    2325  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    2426  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
    … …  
    2729  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
    2830  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
     31  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
    2932  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
    3033  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
Note: See TracChangeset for help on using the changeset viewer.