diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-21 12:38:43 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-21 12:38:43 +0200 |
| commit | 213e3f0860ada9c1f7a5a945d95398c717bfb7aa (patch) | |
| tree | b2559492525283e4de531989d4e9ce82d56ad0c4 /.gitignore | |
| parent | dd56784d2861d866cc3b6e15a145331297d283f0 (diff) | |
| parent | 8de143a99440d708e8e22bd63bcad25c483d8ffa (diff) | |
| download | spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.gz spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.bz2 spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.xz spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase
Conflicts:
lib/spack/spack/cmd/install.py
lib/spack/spack/cmd/setup.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f25ac615fa..a451f9e14e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ /share/spack/modules /share/spack/lmod /TAGS +*.swp /htmlcov .coverage #* |