be70104a3a
Conflicts (taken master): pkgs/development/compilers/llvm/3.4/llvm.nix |
||
---|---|---|
doc | ||
lib | ||
maintainers/scripts | ||
nixos | ||
pkgs | ||
.gitignore | ||
.version | ||
COPYING | ||
default.nix | ||
README.md |
be70104a3a
Conflicts (taken master): pkgs/development/compilers/llvm/3.4/llvm.nix |
||
---|---|---|
doc | ||
lib | ||
maintainers/scripts | ||
nixos | ||
pkgs | ||
.gitignore | ||
.version | ||
COPYING | ||
default.nix | ||
README.md |