Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 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/temp-system/multilib/coreutils.xml

    rec008670 r229ed25  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/coreutils.xml"
    27     xpointer="xpointer(//*[@os='aa'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/coreutils.xml"
    31     xpointer="xpointer(//*[@os='ab'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/coreutils.xml"
    3527    xpointer="xpointer(//*[@os='ba'])"/>
    3628
    … …  
    4133    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4234    href="../common/coreutils.xml"
     35    xpointer="xpointer(//*[@os='p1'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/coreutils.xml"
     39    xpointer="xpointer(//*[@os='p2'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/coreutils.xml"
    4343    xpointer="xpointer(//*[@os='bd'])"/>
    4444
    … …  
    4646    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4747    --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../common/coreutils.xml"
     51    xpointer="xpointer(//*[@os='be1'])"/>
     52
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../common/coreutils.xml"
     55    xpointer="xpointer(//*[@os='s1'])"/>
     56
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/coreutils.xml"
     59    xpointer="xpointer(//*[@os='s2'])"/>
    4860
    4961    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.