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/final-system/multilib/texinfo.xml

    rec008670 r229ed25  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/texinfo.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/texinfo.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/texinfo.xml"
    3426    xpointer="xpointer(//*[@os='a'])"/>
    3527
    … …  
    4739    href="../common/texinfo.xml"
    4840    xpointer="xpointer(//*[@os='e'])"/>
     41
     42    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     43    href="../common/texinfo.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
    4945
    5046    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.