diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2016-01-12 14:36:37 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2016-01-12 14:36:37 -0500 |
| commit | 8eb16ba02d213998272112142631991a63dc21e3 (patch) | |
| tree | e7c3759c0d12bd32f70cadacbada7c8071ea145b /.mailmap | |
| parent | 36d74d2a97b4b00fb9abc7fb07a067dac157f038 (diff) | |
| parent | 4ac530d289db09b4a0e596b96456ba59e815a30d (diff) | |
| download | spack-8eb16ba02d213998272112142631991a63dc21e3.tar.gz spack-8eb16ba02d213998272112142631991a63dc21e3.tar.bz2 spack-8eb16ba02d213998272112142631991a63dc21e3.tar.xz spack-8eb16ba02d213998272112142631991a63dc21e3.zip | |
Merge branch 'develop' into eschnett/petsc-python-2
# Conflicts:
# var/spack/packages/petsc/package.py
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions