Ignore:
Timestamp:
Jan 30, 2011, 1:26:37 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
fff5cb5
Parents:
2572b8e (diff), 27931b9 (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

File:
1 edited

Legend:

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

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
Note: See TracChangeset for help on using the changeset viewer.