summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-01-28 11:26:01 +0100
committeralalazo <massimiliano.culpo@googlemail.com>2016-01-28 11:26:01 +0100
commite76b722e28eedd94277e5d8ea42beeb5a8d5048e (patch)
tree647b1eb7202d973cadb0bf16bb3797da679cccdd /.mailmap
parentbf4231dd4b906f20d522b9df5f2cae2ba6291174 (diff)
parentc2bb00ca2f925c1a8c4b49f7b0a7b22e7c0b43a8 (diff)
downloadspack-e76b722e28eedd94277e5d8ea42beeb5a8d5048e.tar.gz
spack-e76b722e28eedd94277e5d8ea42beeb5a8d5048e.tar.bz2
spack-e76b722e28eedd94277e5d8ea42beeb5a8d5048e.tar.xz
spack-e76b722e28eedd94277e5d8ea42beeb5a8d5048e.zip
Merge branch 'develop' of https://github.com/LLNL/spack into enhancement/os_detection
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1cc13c1eb1..1b99da32b5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -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>