Frederik Rietdijk 658b7c3f2e Merge master into staging		2018-05-13 12:13:25 +02:00
..
applications	Merge master into staging	2018-05-13 12:13:25 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2018-05-08 09:36:00 -05:00
common-updater
data	Merge master into staging	2018-05-13 12:13:25 +02:00
desktops	Merge master into staging	2018-05-13 12:13:25 +02:00
development	Merge master into staging	2018-05-13 12:13:25 +02:00
games	Merge pull request #39192 from r-ryantm/auto-update/rocksndiamonds	2018-05-12 11:55:04 -05:00
misc	Merge master into staging	2018-05-13 12:13:25 +02:00
os-specific	Merge master into staging	2018-05-13 12:13:25 +02:00
servers	Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging	2018-05-13 01:02:09 -04:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2018-05-08 09:36:00 -05:00
stdenv	Revert "darwin.libSystem: multiple outputs"	2018-05-13 10:01:52 +02:00
test	tests: move to attribute set	2018-05-10 23:58:12 -05:00
tools	Merge master into staging	2018-05-13 12:13:25 +02:00
top-level	Merge master into staging	2018-05-13 12:13:25 +02:00