diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-03-21 09:46:49 +0100 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-03-21 09:46:49 +0100 |
| commit | fbeffee91e115ea3f332a321441df7655adbf5b2 (patch) | |
| tree | ff2e691bd230c91178ae82401ec1ef05210218f4 /etc | |
| parent | aef6d50b08daf893174046ba14c09a7019fe1212 (diff) | |
| parent | c0f03506345199c71cc38f5fece3181ba32adad8 (diff) | |
| download | spack-fbeffee91e115ea3f332a321441df7655adbf5b2.tar.gz spack-fbeffee91e115ea3f332a321441df7655adbf5b2.tar.bz2 spack-fbeffee91e115ea3f332a321441df7655adbf5b2.tar.xz spack-fbeffee91e115ea3f332a321441df7655adbf5b2.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/env_objects_flying_around
Conflicts:
lib/spack/spack/package.py
var/spack/repos/builtin/packages/netlib-scalapack/package.py
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions