John Ericson 405412dfd9 Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files ... stdenv setup: Always use both propagated files		2017-11-22 15:23:37 -05:00
..
applications	Merge branch 'master' into staging	2017-11-21 22:48:36 +00:00
build-support	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
common-updater
data	Merge pull request #31890 from mikoim/fonts/migmix	2017-11-21 18:04:02 +00:00
desktops	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
development	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
games	Merge branch 'master' into staging	2017-11-21 22:48:36 +00:00
misc	retroarch: enable parallel building	2017-11-21 19:29:29 +00:00
os-specific	Merge pull request #31908 from andir/alsa-1.1.5	2017-11-22 08:23:26 +00:00
servers	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
top-level	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00