Vladimír Čunát 09af15654f Merge master into closure-size ...

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

2016-03-08 09:58:19 +01:00

..

default.nix

Merge master into closure-size

2016-03-08 09:58:19 +01:00

extras.nix

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00

proc_path.diff

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00