diff options
author | Peter Scheibel <scheibel1@llnl.gov> | 2016-01-19 17:27:18 -0800 |
---|---|---|
committer | Peter Scheibel <scheibel1@llnl.gov> | 2016-01-19 17:27:18 -0800 |
commit | 965af75d23b356b44918f815b0e7ef14bdedcba3 (patch) | |
tree | bef1b0dea7314aef95982fe2f1811768d812aaac /.gitignore | |
parent | d22cf1aed1d033610481cb451909c93916848ccc (diff) | |
parent | 9be37da077158c43eb0c2f6b190773772dfa9ef5 (diff) | |
download | spack-965af75d23b356b44918f815b0e7ef14bdedcba3.tar.gz spack-965af75d23b356b44918f815b0e7ef14bdedcba3.tar.bz2 spack-965af75d23b356b44918f815b0e7ef14bdedcba3.tar.xz spack-965af75d23b356b44918f815b0e7ef14bdedcba3.zip |
Merge branch 'develop' into features/boost-additive-libs
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 |