Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Thu, 8 Mar 2018 20:21:05 +0000 (21:21 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Thu, 8 Mar 2018 20:21:05 +0000 (21:21 +0100)
commitd8fa1890c705ca566a56b69a4880a10dc7cf0098
treec3f220949e5364d981a4895477249ad46852eea0
parent5de561a79634e0814ea22f1cfece9a09efa120be
parentfee7f8a94ec64943109ba9c37f75c28749fb18bd
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/base.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/python.scm
gnu/packages/video.scm
gnu/packages/web.scm
gnu/packages/xorg.scm