diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2014-09-16 23:53:44 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2014-09-16 23:53:44 -0700 |
| commit | 881fdb66ae9a06671cc756baae5a454fce2c2e3d (patch) | |
| tree | ac5a9928f306ae26a32582b60cffc5853e15c514 /.gitignore | |
| parent | 782e45e5b1247f636f519c23de4cc54fe0cc21d1 (diff) | |
| parent | e2509717b9fc022ddbdfab532fcfc0189102c741 (diff) | |
| download | spack-881fdb66ae9a06671cc756baae5a454fce2c2e3d.tar.gz spack-881fdb66ae9a06671cc756baae5a454fce2c2e3d.tar.bz2 spack-881fdb66ae9a06671cc756baae5a454fce2c2e3d.tar.xz spack-881fdb66ae9a06671cc756baae5a454fce2c2e3d.zip | |
Merge branch 'develop' into features/fileutils
Conflicts:
lib/spack/spack/packages.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d6e0d3e60c..828fb04e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ .idea /etc/spackconfig /share/spack/dotkit +/share/spack/modules |