Merge branch 'master' into core-updates
authorMarius Bakke <mbakke@fastmail.com>
Mon, 21 Aug 2017 00:40:37 +0000 (02:40 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Mon, 21 Aug 2017 00:40:37 +0000 (02:40 +0200)
commit2718a9cd096d0f5ae4b23cc0814a42aee5cf3c4d
tree334bed3ef9be203d77065a75380696c2537ede92
parent9c4ce3afac2ad42c832dc7a9f0932744b5fd8892
parente904de7ec1789e243e830b19187b5ef550b2eefa
Merge branch 'master' into core-updates
17 files changed:
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/image.scm
gnu/packages/java.scm
gnu/packages/linux.scm
gnu/packages/maths.scm
gnu/packages/package-management.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/web.scm
gnu/packages/wm.scm
gnu/packages/xorg.scm