Ryan Mulligan bc52706a04 arena: fix evaluation blocking typo		2018-07-24 09:35:10 -07:00
..
applications	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
build-support	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
common-updater
data	Merge staging-next into master	2018-07-22 11:04:28 +02:00
desktops	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
development	hackage-packages.nix: automatic Haskell package set update	2018-07-24 17:15:56 +02:00
games	arena: fix evaluation blocking typo	2018-07-24 09:35:10 -07:00
misc	alock: add license	2018-07-22 17:20:32 +02:00
os-specific	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
servers	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
shells	Merge pull request #43912 from r-ryantm/auto-update/powershell	2018-07-22 08:44:38 +02:00
stdenv	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
test	tests: add some cross tests	2018-07-21 17:00:05 -04:00
tools	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
top-level	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00