Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/multilib/binutils.xml

    r88ef769 r03e6a40  
    8282      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383      href="../common/binutils.xml"
    84       xpointer="xpointer(//*[@os='bd7'])"/>
     84      xpointer="xpointer(//*[@os='bd8'])"/>
    8585
    8686    </variablelist>
    … …  
    9696    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9797    href="../common/binutils.xml"
    98     xpointer="xpointer(//*[@os='bg'])"/>
    99 
    100     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101     href="../common/binutils.xml"
    10298    xpointer="xpointer(//*[@os='bh'])"/>
    10399
    … …  
    105101    href="../common/binutils.xml"
    106102    xpointer="xpointer(//*[@os='bi'])"/>
    107 
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/binutils.xml"
    110     xpointer="xpointer(//*[@os='bj'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/binutils.xml"
    114     xpointer="xpointer(//*[@os='bk'])"/>
    115103
    116104  </sect2>
Note: See TracChangeset for help on using the changeset viewer.