diff options
author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2016-03-25 11:05:05 +0100 |
---|---|---|
committer | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2016-03-25 11:05:05 +0100 |
commit | f15249afe5fb11c34b56610b4505313a69447935 (patch) | |
tree | 17fb672a8b003f262e120bdd06240844f206f453 /.mailmap | |
parent | acaa589bdd8cd6756c350c4d0ee9f402551967e0 (diff) | |
parent | 38ea75e8ca65dd6c896fe7856efdb1d8355ec524 (diff) | |
download | spack-f15249afe5fb11c34b56610b4505313a69447935.tar.gz spack-f15249afe5fb11c34b56610b4505313a69447935.tar.bz2 spack-f15249afe5fb11c34b56610b4505313a69447935.tar.xz spack-f15249afe5fb11c34b56610b4505313a69447935.zip |
Merge branch 'develop' of https://github.com/LLNL/spack into packages/blas_lapack_providers
Conflicts:
var/spack/repos/builtin/packages/py-numpy/package.py
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions