Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (14 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/vim.xml

    r8c3f58f r6cefbfb  
    9090    xpointer="xpointer(//*[@os='m'])"/>
    9191
     92    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     93    href="../common/vim.xml"
     94    xpointer="xpointer(//*[@os='tv1'])"/>
     95
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     97    href="../common/vim.xml"
     98    xpointer="xpointer(//*[@os='tv2'])"/>
     99
    92100  </sect2>
    93101
Note: See TracChangeset for help on using the changeset viewer.