diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-11 16:28:08 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-11 16:28:08 +0200 |
| commit | ab995df777ca8bd0340f66be5624fa543517c13d (patch) | |
| tree | 660335e5d00ae68ab61b3cd21faef3e9135aacb1 /.gitignore | |
| parent | 7a26c60dbd73e0d5c5c6ec1fce8087c889fd0f25 (diff) | |
| parent | 4d939802ae208a79ef685fe59b204bcc86df4b6b (diff) | |
| download | spack-ab995df777ca8bd0340f66be5624fa543517c13d.tar.gz spack-ab995df777ca8bd0340f66be5624fa543517c13d.tar.bz2 spack-ab995df777ca8bd0340f66be5624fa543517c13d.tar.xz spack-ab995df777ca8bd0340f66be5624fa543517c13d.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase
Conflicts:
lib/spack/spack/build_environment.py
lib/spack/spack/cmd/install.py
lib/spack/spack/cmd/setup.py
lib/spack/spack/package.py
var/spack/repos/builtin/packages/gmp/package.py
var/spack/repos/builtin/packages/hdf5/package.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e6200a0676..f25ac615fa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /TAGS /htmlcov .coverage +#* +.#* |