Ignore:
Timestamp:
Feb 3, 2014, 3:21:44 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
4340580
Parents:
849369d (diff), 961afdcd (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 'systemd' of git.cross-lfs.org:cross-lfs into systemd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/multilib/bzip2.xml

    r849369d r43100c0  
    3030    href="../common/bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.