Ignore:
Timestamp:
Feb 22, 2011, 4:53:14 PM (15 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1f9faab
Parents:
957d7a0 (diff), dabbced (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/boot/alpha-chapter.xml
BOOK/boot/common/bootscripts.xml
BOOK/boot/mips-chapter.xml
BOOK/boot/mips64-64-chapter.xml
BOOK/boot/mips64-chapter.xml
BOOK/boot/ppc-chapter.xml
BOOK/boot/ppc64-chapter.xml
BOOK/boot/sparc-chapter.xml
BOOK/boot/sparc64-64-chapter.xml
BOOK/boot/sparc64-chapter.xml
BOOK/boot/x86-chapter.xml
BOOK/boot/x86_64-64-chapter.xml
BOOK/boot/x86_64-chapter.xml
BOOK/bootscripts/alpha-chapter.xml
BOOK/bootscripts/mips-chapter.xml
BOOK/bootscripts/mips64-64-chapter.xml
BOOK/bootscripts/mips64-chapter.xml
BOOK/bootscripts/ppc-chapter.xml
BOOK/bootscripts/ppc64-chapter.xml
BOOK/bootscripts/sparc-chapter.xml
BOOK/bootscripts/sparc64-64-chapter.xml
BOOK/bootscripts/sparc64-chapter.xml
BOOK/bootscripts/x86-chapter.xml
BOOK/bootscripts/x86_64-64-chapter.xml
BOOK/bootscripts/x86_64-chapter.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/coreutils.xml
BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/mips64-64/gcc-static.xml

    r957d7a0 r4317f44  
    1616  </indexterm>
    1717
    18   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1919  href="../../final-system/common/gcc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2424    and no Threads</title>
    2525
    26     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2727    href="../common/gcc-static.xml"
    2828    xpointer="xpointer(//*[@os='aa'])"/>
    2929
    30     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3131    href="../64/gcc-static.xml"
    3232    xpointer="xpointer(//*[@os='ab'])"/>
    3333
    34     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3535    href="../common/gcc-static.xml"
    3636    xpointer="xpointer(//*[@os='ag'])"/>
    3737
    38     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     38    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3939    href="../common/gcc-static.xml"
    4040    xpointer="xpointer(//*[@os='ah'])"/>
    4141
    42     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     42    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../common/gcc-static.xml"
    4444    xpointer="xpointer(//*[@os='ai'])"/>
    4545
    46     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4747    href="../common/gcc-static.xml"
    4848    xpointer="xpointer(//*[@os='aj'])"/>
    4949
    50     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5151    href="../common/gcc-static.xml"
    5252    xpointer="xpointer(//*[@os='t1'])"/>
    5353
    54     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     54    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5555    href="../common/gcc-static.xml"
    5656    xpointer="xpointer(//*[@os='t2'])"/>
    5757
    58     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5959    href="../../final-system/common/gcc.xml"
    6060    xpointer="xpointer(//*[@os='f'])"/>
    6161
    62     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     62    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6363    href="../../final-system/common/gcc.xml"
    6464    xpointer="xpointer(//*[@os='g'])"/>
    6565
    66     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     66    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6767    href="../../final-system/common/gcc.xml"
    6868    xpointer="xpointer(//*[@os='h'])"/>
    … …  
    7878  --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
    7979
    80     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     80    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8181    href="../common/gcc-static.xml"
    8282    xpointer="xpointer(//*[@os='am'])"/>
    8383
    84     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     84    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8585    href="../common/gcc-static.xml"
    8686    xpointer="xpointer(//*[@os='an'])"/>
    8787
    88     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     88    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8989    href="../common/gcc-static.xml"
    9090    xpointer="xpointer(//*[@os='ao'])"/>
    9191
    92     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     92    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9393    href="../common/gcc-static.xml"
    9494    xpointer="xpointer(//*[@os='ap'])"/>
    9595
    96     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9797    href="../common/gcc-static.xml"
    9898    xpointer="xpointer(//*[@os='aq'])"/>
Note: See TracChangeset for help on using the changeset viewer.