Timestamp:
Feb 10, 2011, 5:04:43 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
8050e8b
Parents:
e59e934 (diff), 6d1db7d (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.
git-author:
Joe Ciccone <jciccone@…> (02/10/11 16:52:13)
git-committer:
Joe Ciccone <jciccone@…> (02/10/11 17:04:43)
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/general.ent
BOOK/introduction/common/changelog.xml

(No files)

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