Changeset d0258bc for BOOK/temp-system

Timestamp:

Jun 11, 2014, 8:36:53 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

90eb968

Parents:

3acf8711 (diff), 6652815 (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/introduction/common/changelog.xml

(No files)