Changeset 7a352da8 for BOOK/network

Timestamp:

Sep 5, 2014, 7:37:25 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

5898fbf

Parents:

95835e7 (diff), 234b86a (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 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit

Conflicts:

BOOK/general.ent

(No files)