diff options
| author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2016-06-30 22:19:46 +0200 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2016-06-30 22:19:46 +0200 |
| commit | ba1ada5424a443fefe7093ce3d6a35186ddead5c (patch) | |
| tree | e6f9bc91b8add3780df8c2c17ff2d0b1a4853d0c /.gitignore | |
| parent | a770151359a9c573bfd967f79eab26670d499af0 (diff) | |
| parent | 0e422dec8c8d075e68c31b032628b7d4db96c552 (diff) | |
| download | spack-ba1ada5424a443fefe7093ce3d6a35186ddead5c.tar.gz spack-ba1ada5424a443fefe7093ce3d6a35186ddead5c.tar.bz2 spack-ba1ada5424a443fefe7093ce3d6a35186ddead5c.tar.xz spack-ba1ada5424a443fefe7093ce3d6a35186ddead5c.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/module_refresh_reworking
Conflicts:
lib/spack/spack/cmd/module.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 643e5d9b03..040df3eafd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /var/spack/stage +/var/spack/cache *.pyc /opt/ *~ |