John Ericson e2a2073011 Merge remote-tracking branch 'upstream/master' into staging		2018-09-26 11:23:18 -04:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00
build-support	Revert "patch-shebangs: respect cross compilation"	2018-09-25 21:11:54 +02:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into staging	2018-09-25 14:20:27 -04:00
desktops	Merge pull request #45941 from NixOS/staging-next	2018-09-23 09:31:28 +02:00
development	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00
games	Merge pull request #46586 from elitak/factorio	2018-09-22 19:57:12 +00:00
misc	arc-theme: 2017-05-12 -> 20180715 (#43490)	2018-09-26 15:56:47 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00
shells
stdenv	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00
test	Merge branch 'master' into staging	2018-09-24 21:18:23 +02:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2018-09-26 11:23:18 -04:00