Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Wed, 5 Jun 2019 17:46:16 +0000 (19:46 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 5 Jun 2019 17:46:16 +0000 (19:46 +0200)
commitd4721ff1017b64e5242b09fd7b430665ec580524
tree1bd9ce1a339f5b348e780e4bb7f53a4333bfce01
parent30e12b9664d774aca3948b1fa2e0aee6af09ca40
parentc0f6eebb6d9f6ca9b62344f32ce5f82dab601d53
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/gl.scm
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm