Ignore:
Timestamp:
May 9, 2014, 10:16:17 PM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
9b519e2
Parents:
d299af7 (diff), c38c1fb (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/man-db.xml

    rd299af7 r2690a47  
    6464  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6565  href="../common/man-db.xml"
     66  xpointer="xpointer(id('encoding-man-db'))"/>
     67
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     69  href="../common/man-db.xml"
    6670  xpointer="xpointer(id('contents-man-db'))"/>
    6771
Note: See TracChangeset for help on using the changeset viewer.