Vladimír Čunát 90094b0468 Merge branch 'master' into staging-next ... minor conflict: rust update vs. darwin fixes for it (not tested but seems quite OK)		2020-10-21 13:34:06 +02:00
..
applications	Merge branch 'master' into staging-next	2020-10-21 13:34:06 +02:00
build-support	Merge staging-next into staging	2020-10-20 20:55:46 +02:00
common-updater
data	Merge branch 'master' into staging-next	2020-10-21 13:34:06 +02:00
desktops	Merge pull request #100344 from romildo/upd.efl	2020-10-18 17:03:27 -03:00
development	Merge branch 'master' into staging-next	2020-10-21 13:34:06 +02:00
games	minecraft: 2.1.17627 -> 2.1.17785	2020-10-20 18:22:13 +00:00
misc	jack2: 1.9.14 -> 1.9.16	2020-10-20 21:06:14 +02:00
os-specific	Merge branch 'master' into staging-next	2020-10-21 13:34:06 +02:00
pkgs-lib	pkgs-lib/tests/formats: improve message on failure	2020-10-19 21:46:08 +02:00
servers	Merge staging-next into staging	2020-10-20 20:55:46 +02:00
shells	Merge staging-next into staging	2020-10-20 20:55:46 +02:00
stdenv	Merge pull request #99401 from Ericson2314/cmake-optional-openssl	2020-10-13 22:13:13 -04:00
test	Merge branch 'staging-next' into staging	2020-10-11 00:27:42 +02:00
tools	Merge branch 'master' into staging-next	2020-10-21 13:34:06 +02:00
top-level	Merge branch 'master' into staging-next	2020-10-21 13:34:06 +02:00