Skip to content
Snippets Groups Projects
Commit ab995df7 authored by Massimiliano Culpo's avatar Massimiliano Culpo
Browse files

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
parents 7a26c60d 4d939802
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3341 additions and 1023 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment