John Ericson de6e133486 Merge branch 'ericson2314-cross-base' into staging ... All the underlying commits are already on master		2017-12-10 17:16:11 -05:00
..
applications	Merge branch 'master' into staging	2017-12-10 15:24:30 +00:00
build-support	Merge branch 'master' into staging	2017-12-10 15:24:30 +00:00
common-updater
data	Merge pull request #32421 from caugner/zilla-slab	2017-12-08 16:10:46 +00:00
desktops	Merge branch 'master' into staging	2017-12-09 21:00:07 +01:00
development	Merge branch 'master' into staging	2017-12-10 15:24:30 +00:00
games	Merge branch 'master' into staging	2017-12-09 21:00:07 +01:00
misc	Merge branch 'master' into staging	2017-12-09 21:00:07 +01:00
os-specific	Merge branch 'master' into staging	2017-12-10 15:24:30 +00:00
servers	pythonPackages: rename dns -> dnspython	2017-12-10 15:27:06 +01:00
shells	nix-bash-completions: lazy load aware install	2017-12-10 14:07:13 +00:00
stdenv	stdenv: fix use of config-specified allowInsecurePredicate	2017-12-09 20:43:30 +00:00
test	Add clang multilib variants (x64_64-only, 64/32bit), basic multilib tests	2017-12-05 07:17:14 -06:00
tools	Merge branch 'master' into staging	2017-12-10 15:24:30 +00:00
top-level	Merge branch 'ericson2314-cross-base' into staging	2017-12-10 17:16:11 -05:00