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/multilib/xz-n32.xml

    r8f3d17f r32f55264  
    5757    xpointer="xpointer(//*[@os='i'])"/>
    5858
    59 <screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="xz.xml"
     61    xpointer="xpointer(//*[@os='j'])"/>
     62
     63<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
    6064
    6165  </sect2>
Note: See TracChangeset for help on using the changeset viewer.