Merge branch 'master' into core-updates
authorMarius Bakke <mbakke@fastmail.com>
Tue, 25 Sep 2018 23:11:32 +0000 (01:11 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Tue, 25 Sep 2018 23:11:32 +0000 (01:11 +0200)
commit6a0427af6cc3d52c0efc09262e90c1858ae6f40e
treeafedf3a5728dfac46c20aed448326debccf96562
parent985d542e028517b2888fa61831233a2b60dc7d48
parent3b97a1779f3b65d582b8edc8c154b6414314b946
Merge branch 'master' into core-updates
19 files changed:
gnu/local.mk
gnu/packages/audio.scm
gnu/packages/check.scm
gnu/packages/databases.scm
gnu/packages/gl.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/guile.scm
gnu/packages/image.scm
gnu/packages/linux.scm
gnu/packages/maths.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-crypto.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/web.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm