Merge branch 'master' into core-updates
authorMarius Bakke <mbakke@fastmail.com>
Sat, 24 Feb 2018 20:49:30 +0000 (21:49 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Sat, 24 Feb 2018 20:49:30 +0000 (21:49 +0100)
commite58bf025df9ea1450e94fb63e87afc1fa5afd182
tree358c2dc04c675fc58088cdfcf42ab1a7755f71ea
parent9102ce124c807a6a3d9e8f492adafd830cf833f3
parente8ee100e8eb46224d5549dffc707cfeb96ad0e21
Merge branch 'master' into core-updates
gnu/local.mk
gnu/packages/elf.scm
gnu/packages/gnupg.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/packages/xorg.scm