diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-06-18 13:31:29 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-06-18 13:31:29 +0200 |
| commit | a17d1efe7c738d08718fb46ae7a04d52c1a63dc1 (patch) | |
| tree | a166e21e9410c4bbe9dd709dc34ccede3cc2e372 /.mailmap | |
| parent | 30c9d976f6e7b74b6713215e8f7c7924a9f43f43 (diff) | |
| parent | 62b2f2a7c9d54fb864e6aae91f1f47a1b35d1828 (diff) | |
| download | spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.gz spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.bz2 spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.xz spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/source_diffs_in_environment_modifications
Conflicts:
lib/spack/spack/test/environment.py
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions