diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-09-04 10:12:52 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-09-04 10:12:52 +0200 |
| commit | 47f6a6d3cfd1285fb5d8cd95a415c8a24045b330 (patch) | |
| tree | 8f0b73ead979cd5e9f8181642d0ee1cf1ddff79b /.gitignore | |
| parent | f5433477b9f7c98ca00947cf1b1fdc106cca1080 (diff) | |
| parent | 16c5403ab3ca35dfa6d715ce2c5434c65de81c17 (diff) | |
| download | spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.tar.gz spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.tar.bz2 spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.tar.xz spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.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/package.py
var/spack/repos/builtin/packages/astyle/package.py
var/spack/repos/builtin/packages/lzo/package.py
var/spack/repos/builtin/packages/openjpeg/package.py
var/spack/repos/builtin/packages/swiftsim/package.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions