Ignore:
Timestamp:
Oct 10, 2012, 6:42:21 PM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f7b2c72
Parents:
0cce40d (diff), 80cbd64 (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' of git.cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/mips-chapter.xml

    r0cce40d r73ace20  
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ppl.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
     
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    32   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3332  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3433  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
     
    6261  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
    6362  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
    64   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
     63  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
    6564  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
    6665  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
Note: See TracChangeset for help on using the changeset viewer.