Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Mon, 4 Mar 2019 21:31:59 +0000 (22:31 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Mon, 4 Mar 2019 21:31:59 +0000 (22:31 +0100)
commit4f8dc1536adf5965597d53a1e7867690429a12b2
tree1d6456941b23316020c9f0edac8e22187134488d
parent19464173bafdc42adfc8dd7277c491c40ddef66b
parent5ae458befc803fe357210fef343cf322d9f4bade
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/python-web.scm
gnu/packages/sdl.scm
gnu/packages/video.scm
gnu/packages/xorg.scm