Skip to content
Commit c62b5456 authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge 

LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
	pkgs/top-level/all-packages.nix
parents f91dea4c 41f074f1
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