diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-29 21:44:39 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-29 21:44:44 -0400 |
| commit | 062c7e43ed306c66f1107ee3bd52357aa8daf11a (patch) | |
| tree | f620ea2436a9809d7e4113fa3c9704c5f7892c8e /gnu/local.mk | |
| parent | f4fe6c991cbac609be327ad8ed793c5b1b91aac8 (diff) | |
| parent | 269d9172ff037bd41bee3777166b3bc14d93f745 (diff) | |
| download | patches-062c7e43ed306c66f1107ee3bd52357aa8daf11a.tar patches-062c7e43ed306c66f1107ee3bd52357aa8daf11a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index fb739f46e9..39950b0de9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -734,6 +734,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjpeg-CVE-2016-5157.patch \ %D%/packages/patches/openjpeg-CVE-2016-7163.patch \ %D%/packages/patches/openjpeg-use-after-free-fix.patch \ + %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-memory-exhaustion.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ |