Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix		2018-05-16 03:09:33 +03:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
build-support	Merge remote-tracking branch 'upstream/staging' into strictDeps	2018-05-14 23:33:03 -04:00
common-updater
data	Merge master into staging	2018-05-13 12:13:25 +02:00
desktops	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
development	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
games	Merge pull request #39192 from r-ryantm/auto-update/rocksndiamonds	2018-05-12 11:55:04 -05:00
misc	Merge remote-tracking branch 'upstream/staging' into strictDeps	2018-05-14 23:33:03 -04:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2018-05-14 10:57:33 -04:00
stdenv	stdenv cross adapter: Don't define crossConfig	2018-05-14 23:33:12 -04:00
test	tests: move to attribute set	2018-05-10 23:58:12 -05:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00