diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
commit | 8505eb19a4071f563811d4fe33471441c2db58b7 (patch) | |
tree | 123241c704e7d1a88eb4efe2793a6898e2e72216 /gnu/local.mk | |
parent | 3b88f3767d9f3ad2cc64173525cd53d429bfe7e7 (diff) | |
parent | b097a3387ea78797104f97eef445f5da6278c922 (diff) | |
download | guix-patches-8505eb19a4071f563811d4fe33471441c2db58b7.tar guix-patches-8505eb19a4071f563811d4fe33471441c2db58b7.tar.gz |
Merge branch 'staging' into core-updates
Conflicts:
gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the
commit log really confused me here... It's from 8c6b077bfae (staging).
gnu/packages/xorg.scm: xkeyboard-config updated both places.
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 7ad66f5df8..2ca90dfce6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -575,6 +575,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \ %D%/packages/patches/gcc-6-cross-environment-variables.patch \ %D%/packages/patches/gcj-arm-mode.patch \ + %D%/packages/patches/gdk-pixbuf-list-dir.patch \ %D%/packages/patches/gd-fix-chunk-size-on-boundaries.patch \ %D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ |