Skip to content
Commit 1a06373c authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

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

Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
parents eb862c48 68052b56
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