Ignore:
Timestamp:
May 30, 2011, 3:05:49 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
271d1f96
Parents:
32f55264 (diff), 9f51c06 (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/grep.xml

    r32f55264 r0230c0a  
    2121  <sect2 role="installation">
    2222    <title>Installation of Grep</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/grep.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/grep.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.