merge 'staging' into modular-stdenv (1e389c97) · Commits · jan / nixpkgs

Commit 1e389c97 authored Aug 31, 2014 by

Vladimír Čunát

In 2c62a36b the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment