diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-05 09:33:59 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-05 09:33:59 +0200 |
| commit | 7a26c60dbd73e0d5c5c6ec1fce8087c889fd0f25 (patch) | |
| tree | e37497aff3b3b24618677138efd68fde37b1916e /.gitignore | |
| parent | 47f6a6d3cfd1285fb5d8cd95a415c8a24045b330 (diff) | |
| parent | bff1656a1a842b4de217129cc8cba732a30928a7 (diff) | |
| download | spack-7a26c60dbd73e0d5c5c6ec1fce8087c889fd0f25.tar.gz spack-7a26c60dbd73e0d5c5c6ec1fce8087c889fd0f25.tar.bz2 spack-7a26c60dbd73e0d5c5c6ec1fce8087c889fd0f25.tar.xz spack-7a26c60dbd73e0d5c5c6ec1fce8087c889fd0f25.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase
Conflicts:
lib/spack/spack/cmd/setup.py
lib/spack/spack/package.py
var/spack/repos/builtin/packages/gmp/package.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b1215f0c7e..e6200a0676 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/db /var/spack/stage /var/spack/cache /var/spack/repos/*/index.yaml @@ -12,6 +13,7 @@ /etc/spackconfig /share/spack/dotkit /share/spack/modules +/share/spack/lmod /TAGS /htmlcov .coverage |