summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-01-17 19:42:28 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2016-01-19 01:16:08 -0800
commit8d6342c53d91f302204d0bbb54f06978a6de26a7 (patch)
tree8848c00c94c5c87bd8c6fb4882e4362920d7096e /.gitignore
parentd802165e039a3661831e84ecbdd31f1c4107d39d (diff)
parent97b492756acce93dbd5f1c305504f07df7582ba0 (diff)
downloadspack-8d6342c53d91f302204d0bbb54f06978a6de26a7.tar.gz
spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.tar.bz2
spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.tar.xz
spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.zip
Merge branch 'mplegendre-multi_pkgsrc_roots' into develop
- This moves var/spack/packages to var/spack/repos/builtin/packages. - Packages that did not exist in the source branch, or were changed in develop, were moved into var/spack/repos/builtin/packages as part of the integration. Conflicts: lib/spack/spack/test/unit_install.py var/spack/repos/builtin/packages/clang/package.py
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
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