Merge branch 'staging' into modular-stdenv (82797f98) · Commits · jan / nixpkgs

Commit 82797f98 authored Sep 08, 2014 by

Vladimír Čunát

Merge branch 'staging' into modular-stdenv

Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix

parents 1e389c97 152ae27a

Hide whitespace changes

Inline Side-by-side

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.

Plain diff Email patch

Please register or to comment