William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" ... This reverts commit 741bf840da. This reverts the fallout from reverting the major changes.		2015-11-14 12:32:51 -08:00
..
applications	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
build-support	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
data
desktops	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
development	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
games	macopix: init at 1.7.4	2015-11-12 20:54:48 +00:00
misc	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
os-specific	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
servers	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
shells
stdenv
test
tools	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
top-level	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00