summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@googlemail.com>2016-03-25 11:05:05 +0100
committerMassimiliano Culpo <massimiliano.culpo@googlemail.com>2016-03-25 11:05:05 +0100
commitf15249afe5fb11c34b56610b4505313a69447935 (patch)
tree17fb672a8b003f262e120bdd06240844f206f453 /.mailmap
parentacaa589bdd8cd6756c350c4d0ee9f402551967e0 (diff)
parent38ea75e8ca65dd6c896fe7856efdb1d8355ec524 (diff)
downloadspack-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