Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Sun, 23 Dec 2018 22:26:04 +0000 (23:26 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 23 Dec 2018 22:26:04 +0000 (23:26 +0100)
commit02bf685d00238f74d28211e71d22a03f58e962cd
tree00d0bc1ef3fd74b6dc5d3ce68cb24835bf07a91f
parent472c36bd36696cfe744e8a7b8f4d4ac5800e0f68
parent8f2253af7da1c537b4c11e6b43c8d0a9f026b609
Merge branch 'master' into staging
doc/guix.texi
gnu/local.mk
gnu/packages/emacs.scm
gnu/packages/games.scm
gnu/packages/gnuzilla.scm
gnu/packages/linux.scm
gnu/packages/maths.scm