Vladimír Čunát ee86a325dd Merge branch 'staging-next' into staging ... Conflicts (simple): nixos/doc/manual/release-notes/rl-1909.xml		2019-06-03 22:34:49 +02:00
..
applications	Merge branch 'staging-next' into staging	2019-06-03 22:34:49 +02:00
build-support	Merge branch 'master' into staging-next	2019-06-03 10:01:25 +02:00
common-updater	common-updater: Fix syntax	2019-05-06 08:49:11 -04:00
data	Merge branch 'master' into staging-next	2019-06-03 10:01:25 +02:00
desktops	gnome3.gnome-todo: more explanation for the parent commit	2019-05-30 12:02:38 +02:00
development	Merge branch 'staging-next' into staging	2019-06-03 22:34:49 +02:00
games	treewide: update cargoSha256 hashes for cargo-vendor upgrade	2019-06-01 15:17:52 +00:00
misc	Merge branch 'master' into staging-next	2019-06-03 10:01:25 +02:00
os-specific	Merge branch 'staging-next' into staging	2019-06-03 22:34:49 +02:00
servers	Merge branch 'staging-next' into staging	2019-06-03 22:34:49 +02:00
shells	powershell: 6.2.0 -> 6.2.1	2019-06-02 13:12:23 -05:00
stdenv	Merge branch 'staging-next' into staging	2019-05-26 09:48:55 +02:00
test	all-packages/test: add gcc9Stdenv, cc-wrapper-gcc9	2019-05-07 17:21:31 -05:00
tools	Merge branch 'staging-next' into staging	2019-06-03 22:34:49 +02:00
top-level	Merge branch 'staging-next' into staging	2019-06-03 22:34:49 +02:00