diff options
Diffstat (limited to 'patches.csv')
| -rw-r--r-- | patches.csv | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/patches.csv b/patches.csv index 2326450..82ad10d 100644 --- a/patches.csv +++ b/patches.csv @@ -1,6 +1,15 @@ +<<<<<<< HEAD bash,5.1,http://clfs.org/~kb0iic/patches/bash-@-fixes-1.patch,55340b67b1401007a816ea97951695d7
bzip2,1.0.8,http://www.linuxfromscratch.org/patches/lfs/10.1/bzip2-@-install_docs-1.patch,6a5ac7e89b791aae556de0f745916f7f
coreutils,8.32,http://www.linuxfromscratch.org/patches/lfs/10.1/coreutils-@-i18n-1.patch,cd8ebed2a67fff2e231026df91af6776
glibc,2.33,http://www.linuxfromscratch.org/patches/lfs/10.1/glibc-@-fhs-1.patch,9a5997c3452909b1769918c759eff8a2
kbd,2.4.0,http://www.linuxfromscratch.org/patches/lfs/10.1/kbd-@-backspace-1.patch,f75cca16a38da6caa7d52151f7136895
sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/development/sysvinit-@-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc
+======= +bash,5.1,http://clfs.org/~kb0iic/patches/bash-@-fixes-2.patch,5b1ebb60889d36a9718d154a0cf47385 +bzip2,1.0.8,http://www.linuxfromscratch.org/patches/lfs/10.1/bzip2-@-install_docs-1.patch,6a5ac7e89b791aae556de0f745916f7f +coreutils,8.32,http://www.linuxfromscratch.org/patches/lfs/10.1/coreutils-@-i18n-1.patch,cd8ebed2a67fff2e231026df91af6776 +glibc,2.33,http://www.linuxfromscratch.org/patches/lfs/10.1/glibc-@-fhs-1.patch,9a5997c3452909b1769918c759eff8a2 +kbd,2.4.0,http://www.linuxfromscratch.org/patches/lfs/10.1/kbd-@-backspace-1.patch,f75cca16a38da6caa7d52151f7136895 +sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/development/sysvinit-@-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc +>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 |