Tuomas Tynkkynen 3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/development/tools/misc/binutils/default.nix		2018-04-22 22:31:30 +03:00
..
applications	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
common-updater
data	Merge pull request #39204 from r-ryantm/auto-update/osinfo-db	2018-04-21 18:26:32 +01:00
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
games	Merge pull request #39237 from r-ryantm/auto-update/gzdoom	2018-04-22 13:30:25 +00:00
misc	Merge pull request #39252 from r-ryantm/auto-update/cups-filters	2018-04-21 12:44:30 +01:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
servers	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
shells	pkgs/shells: move extensions to subdirs	2018-04-17 14:47:32 -05:00
stdenv	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
test
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00