Ignore:
Timestamp:
May 23, 2011, 2:55:11 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
0230c0a
Parents:
8f3d17f (diff), 1ac2d0c (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 simp

File:
1 edited

Legend:

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

    r8f3d17f r32f55264  
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
    4143  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
    4244  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
Note: See TracChangeset for help on using the changeset viewer.