From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 23 Oct 2019 18:48:55 +0000 (+0200)
Subject: Merge branch 'master' into staging
X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/4c1918db34e09f0da793c607acc161bdf9ec5535

Merge branch 'master' into staging
---

4c1918db34e09f0da793c607acc161bdf9ec5535
diff --cc gnu/local.mk
index 7f690598c0,50bcab514a..c6ddbf4e99
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1326,7 -1328,7 +1330,8 @@@ dist_patch_DATA =						
    %D%/packages/patches/scotch-build-parallelism.patch		\
    %D%/packages/patches/scotch-integer-declarations.patch	\
    %D%/packages/patches/sdl-libx11-1.6.patch			\
 +  %D%/packages/patches/sdl2-mesa-compat.patch			\
+   %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch	\
    %D%/packages/patches/seq24-rename-mutex.patch			\
    %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
    %D%/packages/patches/shishi-fix-libgcrypt-detection.patch	\