diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-01-26 08:59:25 +0100 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-01-26 08:59:25 +0100 |
| commit | 6f11a64af5b994b31100e0313c25dfb4f6227255 (patch) | |
| tree | 35949b8c513849b4bee4b0c2b73e6f9fd1b58084 /.mailmap | |
| parent | d95d169ac50a3c253ef9712782626af1e1610ca7 (diff) | |
| parent | 1a5270023803303f07db507fa36139fb52111b9d (diff) | |
| download | spack-6f11a64af5b994b31100e0313c25dfb4f6227255.tar.gz spack-6f11a64af5b994b31100e0313c25dfb4f6227255.tar.bz2 spack-6f11a64af5b994b31100e0313c25dfb4f6227255.tar.xz spack-6f11a64af5b994b31100e0313c25dfb4f6227255.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into refactoring/resource_directive
Conflicts:
lib/spack/spack/fetch_strategy.py
lib/spack/spack/mirror.py
lib/spack/spack/package.py
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -9,3 +9,5 @@ Saravan Pantham <saravan.pantham@gmail.com> Saravan Pantham <pantham1@su Tom Scogland <tscogland@llnl.gov> Tom Scogland <scogland1@llnl.gov> Tom Scogland <tscogland@llnl.gov> Tom Scogland <tom.scogland@gmail.com> Joachim Protze <protze@rz.rwth-aachen.de> jprotze <protze@rz.rwth-aachen.de> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@surface86.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory Lee <lee218@llnl.gov> |