Jan Tojnar e6c0c98940 Merge branch 'master' into staging-next ... zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.		2021-01-08 02:07:34 +01:00
..
applications	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
build-support	Merge branch 'master' into staging-next	2021-01-07 13:04:31 +01:00
common-updater
data	Merge branch 'master' into staging-next	2021-01-07 13:04:31 +01:00
desktops	Merge branch 'master' into staging-next	2021-01-07 13:04:31 +01:00
development	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
games	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
misc	Merge branch 'master' into staging-next	2021-01-07 13:04:31 +01:00
os-specific	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
shells	Merge branch 'master' into staging-next	2021-01-07 13:04:31 +01:00
stdenv
test
tools	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
top-level	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00