Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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 systemd

Conflicts:

BOOK/introduction/common/changelog.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r8c3f58f r6cefbfb  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" EGREP="grep -E" \
     30  ./configure --prefix=/tools \
    3031    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3132    --libdir=/tools/lib64</userinput></screen>
Note: See TracChangeset for help on using the changeset viewer.