diff options
author | Gregory Becker <becker33@llnl.gov> | 2016-05-18 15:13:40 -0700 |
---|---|---|
committer | Gregory Becker <becker33@llnl.gov> | 2016-05-18 15:13:40 -0700 |
commit | 9f59c128bec12baede054bf54b9afc69b2130da7 (patch) | |
tree | a76d26f1601b9859293cdc7426248983a3044e44 /.gitignore | |
parent | 0fd9cdb861b9b794cc6aa20cd5ecca1989a43820 (diff) | |
parent | d3916707557762abb4268c4f523eac0d222b58b1 (diff) | |
download | spack-9f59c128bec12baede054bf54b9afc69b2130da7.tar.gz spack-9f59c128bec12baede054bf54b9afc69b2130da7.tar.bz2 spack-9f59c128bec12baede054bf54b9afc69b2130da7.tar.xz spack-9f59c128bec12baede054bf54b9afc69b2130da7.zip |
Partial merge of mainline develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4b97de5d50..643e5d9b03 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /share/spack/dotkit /share/spack/modules /TAGS +/htmlcov +.coverage |