Skip to content
Commit a85dcf4a authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Merge remote-tracking branch 'origin/master' into staging 

Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
parents 4b2ce848 46a9e805
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment