Changeset 1718e20 for patches

Timestamp:

May 23, 2011, 3:04:49 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

cfb2026a

Parents:

30a199c (diff), 1ac2d0c (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' into systemd

Conflicts:

BOOK/final-system/common/kbd.xml

Location:

patches

Files:

• coreutils-8.11-uname-1.patch (deleted)
• kbd-1.15.3-es.po_fix-1.patch (added)
• perl-5.12.2-Configure_multilib-1.patch (deleted)
• perl-5.12.2-libc-1.patch (deleted)