Skip to content
Commit be70104a authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge master into x-updates 

Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
parents 8e4665a6 ec985c8f
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