diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-01-26 08:59:25 +0100 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-01-26 08:59:25 +0100 |
| commit | 6f11a64af5b994b31100e0313c25dfb4f6227255 (patch) | |
| tree | 35949b8c513849b4bee4b0c2b73e6f9fd1b58084 /.gitignore | |
| parent | d95d169ac50a3c253ef9712782626af1e1610ca7 (diff) | |
| parent | 1a5270023803303f07db507fa36139fb52111b9d (diff) | |
| download | spack-6f11a64af5b994b31100e0313c25dfb4f6227255.tar.gz spack-6f11a64af5b994b31100e0313c25dfb4f6227255.tar.bz2 spack-6f11a64af5b994b31100e0313c25dfb4f6227255.tar.xz spack-6f11a64af5b994b31100e0313c25dfb4f6227255.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into refactoring/resource_directive
Conflicts:
lib/spack/spack/fetch_strategy.py
lib/spack/spack/mirror.py
lib/spack/spack/package.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1c6ca4c99e..4b97de5d50 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /etc/spackconfig /share/spack/dotkit /share/spack/modules +/TAGS |