diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-20 21:02:19 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-20 21:02:19 +0200 |
| commit | 40cb314638a01be2cf2e719a48cfb381b039a6a7 (patch) | |
| tree | bbbb68691fbd47032b6313ecc8e3debfe7426830 /.gitignore | |
| parent | 6c00a13ed5d76e5cb0e8e493a20c498bbfa1111c (diff) | |
| parent | 79e066d53c2baa4bf84bdaa84502e7d282020c0f (diff) | |
| download | spack-40cb314638a01be2cf2e719a48cfb381b039a6a7.tar.gz spack-40cb314638a01be2cf2e719a48cfb381b039a6a7.tar.bz2 spack-40cb314638a01be2cf2e719a48cfb381b039a6a7.tar.xz spack-40cb314638a01be2cf2e719a48cfb381b039a6a7.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases
Conflicts:
lib/spack/spack/package.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 040df3eafd..960b5b0035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,12 @@ /var/spack/stage /var/spack/cache *.pyc -/opt/ +/opt *~ .DS_Store .idea -/etc/spack/* +/etc/spack/licenses +/etc/spack/*.yaml /etc/spackconfig /share/spack/dotkit /share/spack/modules |