Timestamp:
Jun 11, 2014, 8:39:49 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
ab689cc
Parents:
bb0285e3 (diff), 782606b (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

(No files)

Note: See TracChangeset for help on using the changeset viewer.