Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/os-specific/linux/kernel/generic.nix		2018-02-07 03:41:24 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
build-support
common-updater
data
desktops
development	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
games
misc
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
servers
shells
stdenv
test
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00