Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv (811de3bf) · Commits · jan / nixpkgs

Commit 811de3bf authored Oct 09, 2014 by

Eelco Dolstra

Conflicts:
	pkgs/tools/security/gnupg/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