diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-05-11 16:11:19 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-05-11 16:11:19 +0200 |
| commit | 78ae5d7723df810e65fe69b4fb0d7773e748e085 (patch) | |
| tree | 4ab1421b4e3edb44e28441f9a3394a3fe6be7fc5 /.mailmap | |
| parent | 22bb0562fea525afb329d5710970785189d3af63 (diff) | |
| parent | 3d3a520a7d79f40f167f2856c5787ef94739eedc (diff) | |
| download | spack-78ae5d7723df810e65fe69b4fb0d7773e748e085.tar.gz spack-78ae5d7723df810e65fe69b4fb0d7773e748e085.tar.bz2 spack-78ae5d7723df810e65fe69b4fb0d7773e748e085.tar.xz spack-78ae5d7723df810e65fe69b4fb0d7773e748e085.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config
Conflicts:
lib/spack/spack/config.py
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions