Ignore:
Timestamp:
May 18, 2011, 4:53:46 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1718e20
Parents:
bd31da6b (diff), 279277d (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

Location:
BOOK/final-system/multilib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/bison-n32.xml

    rbd31da6b r30a199c  
    1313  <indexterm zone="ch-system-bison-n32">
    1414    <primary sortas="a-Bison">Bison</primary>
     15    <secondary>N32</secondary>
    1516  </indexterm>
    1617

  • BOOK/final-system/multilib/bison.xml

    rbd31da6b r30a199c  
    1313  <indexterm zone="ch-system-bison-32">
    1414    <primary sortas="a-Bison">Bison</primary>
     15    <secondary>32 Bit</secondary>
    1516  </indexterm>
    1617

  • BOOK/final-system/multilib/gcc.xml

    rbd31da6b r30a199c  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/multiarch_wrapper.xml

    rbd31da6b r30a199c  
    1212
    1313  <indexterm zone="ch-system-multiarch-wrapper">
    14     <primary sortas="a-File">Multiarch Wrapper</primary>
     14    <primary sortas="a-Multiarch Wrapper">Multiarch Wrapper</primary>
    1515  </indexterm>
    1616

  • BOOK/final-system/multilib/pkg-config.xml

    rbd31da6b r30a199c  
    1212
    1313  <indexterm zone="ch-system-pkg-config">
    14     <primary sortas="a-Autoconf">Pkg-config</primary>
     14    <primary sortas="a-Pkg-config">Pkg-config</primary>
    1515  </indexterm>
    1616

  • BOOK/final-system/multilib/udev-n32.xml

    rbd31da6b r30a199c  
    1313  <indexterm zone="ch-system-udev-n32">
    1414    <primary sortas="a-Udev">Udev</primary>
     15    <secondary>N32</secondary>
    1516  </indexterm>
    1617

  • BOOK/final-system/multilib/udev.xml

    rbd31da6b r30a199c  
    1313  <indexterm zone="ch-system-udev-32">
    1414    <primary sortas="a-Udev">Udev 32 Bit Libraries</primary>
     15    <secondary>32 Bit</secondary>
    1516  </indexterm>
    1617
Note: See TracChangeset for help on using the changeset viewer.