Changeset f365c65 for BOOK/temp-system


Ignore:
Timestamp:
Apr 5, 2014, 7:17:34 PM (10 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
4feb7c9
Parents:
ef451da (diff), 2ffa935 (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.clfs.org:cross-lfs into systemd

Location:
BOOK/temp-system
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/common/bison.xml

    ref451da rf365c65  
    2727<screen os='s2'><userinput>cp -v Makefile.in{,.orig}
    2828sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/bison.xml"
    31     xpointer="xpointer(//*[@os='t3'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../../final-system/common/bison.xml"
    35     xpointer="xpointer(//*[@os='t4'])"/>
    3629
    3730    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/bison.xml

    ref451da rf365c65  
    3030    href="../common/bison.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../../final-system/common/bison.xml"
    35     xpointer="xpointer(//*[@os='t3'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../../final-system/common/bison.xml"
    39     xpointer="xpointer(//*[@os='t4'])"/>
    4032
    4133    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.