Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Tue, 23 Jan 2018 22:01:07 +0000 (17:01 -0500)
committerMark H Weaver <mhw@netris.org>
Tue, 23 Jan 2018 22:01:07 +0000 (17:01 -0500)
commita102d359a68ce7219a1880e47dd6f9332cbbce3a
treed879e718f08d776ad84c456c91a349e59941d1f2
parent07b8ea841e1e2eda5b367f35cf68d23d0520cc4d
parentf3a13a21e50fa3751fc39e5768ea6843bfc19df2
Merge branch 'master' into core-updates
18 files changed:
Makefile.am
gnu/local.mk
gnu/packages/autotools.scm
gnu/packages/bioinformatics.scm
gnu/packages/compression.scm
gnu/packages/cross-base.scm
gnu/packages/django.scm
gnu/packages/emacs.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/python.scm
gnu/packages/statistics.scm
gnu/packages/version-control.scm
gnu/packages/video.scm
gnu/packages/xml.scm
gnu/system.scm