Changeset 7cb9b1d for patches

Timestamp:

May 29, 2014, 12:58:23 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, master, systemd

Children:

000a8f8

Parents:

fcc84cc (diff), 67d6f59 (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' of git.cross-lfs.org:cross-lfs

Conflicts:

BOOK/introduction/common/changelog.xml

Location:

patches

Files:

• systemd-212-compat-1.patch (deleted)
• systemd-213-compat-1.patch (added)