Todd Gamblin
|
c65fd3a289
|
Merge branch 'develop' into mplegendre-multi_pkgsrc_roots
Conflicts:
lib/spack/spack/cmd/create.py
lib/spack/spack/cmd/extensions.py
lib/spack/spack/cmd/fetch.py
lib/spack/spack/cmd/uninstall.py
lib/spack/spack/config.py
lib/spack/spack/database.py
lib/spack/spack/directory_layout.py
lib/spack/spack/packages.py
lib/spack/spack/spec.py
|
2015-12-25 16:35:55 -08:00 |
|