diff options
author | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
commit | a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15 (patch) | |
tree | ba2c4880e3f4ce6509ff219d0fd646493d085e1d /gnu-system.am | |
parent | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (diff) | |
parent | 20095cc5139666fe67b3ae76b3f46ff85e4956bb (diff) | |
download | gnu-guix-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar gnu-guix-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar.gz |
Merge branch 'master' into security-updates
Diffstat (limited to 'gnu-system.am')
-rw-r--r-- | gnu-system.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index ce8417eecb..d11baa7f88 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -484,7 +484,6 @@ dist_patch_DATA = \ gnu/packages/patches/geoclue-config.patch \ gnu/packages/patches/ghostscript-CVE-2015-3228.patch \ gnu/packages/patches/ghostscript-runpath.patch \ - gnu/packages/patches/gitolite-openssh-6.8-compat.patch \ gnu/packages/patches/glib-networking-ssl-cert-file.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ |