diff options
| author | Matthew LeGendre <legendre1@llnl.gov> | 2016-03-09 11:09:37 -0800 |
|---|---|---|
| committer | Matthew LeGendre <legendre1@llnl.gov> | 2016-03-09 11:09:37 -0800 |
| commit | 87db69478d021d16cc4770d804e7ccf94161d85b (patch) | |
| tree | 920ff0bb4ee32d4f7f502dd8b76edff86f3a9b99 /.mailmap | |
| parent | fa888a4ba15176e9d415ffced41f6f16801f1938 (diff) | |
| parent | ad7d89b16582bb9c89dfd5fd93bfa1b49c8935b0 (diff) | |
| download | spack-87db69478d021d16cc4770d804e7ccf94161d85b.tar.gz spack-87db69478d021d16cc4770d804e7ccf94161d85b.tar.bz2 spack-87db69478d021d16cc4770d804e7ccf94161d85b.tar.xz spack-87db69478d021d16cc4770d804e7ccf94161d85b.zip | |
Merge branch 'develop' into features/external-packages
Conflicts:
lib/spack/spack/package.py
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1,13 +1,20 @@ Todd Gamblin <tgamblin@llnl.gov> George Todd Gamblin <gamblin2@llnl.gov> +Todd Gamblin <tgamblin@llnl.gov> Todd Gamblin <gamblin2@llnl.gov> Adam Moody <moody20@llnl.gov> Adam T. Moody <moody20@llnl.gov> Alfredo Gimenez <gimenez1@llnl.gov> Alfredo Gimenez <alfredo.gimenez@gmail.com> David Boehme <boehme3@llnl.gov> David Boehme <boehme3@sierra324.llnl.gov> David Boehme <boehme3@llnl.gov> David Boehme <boehme3@sierra648.llnl.gov> Kevin Brandstatter <kjbrandstatter@gmail.com> Kevin Brandstatter <kbrandst@hawk.iit.edu> Luc Jaulmes <luc.jaulmes@bsc.es> Luc Jaulmes <jaulmes1@llnl.gov> -Saravan Pantham <saravan.pantham@gmail.com> Saravan Pantham <pantham1@surface86.llnl.gov +Saravan Pantham <saravan.pantham@gmail.com> Saravan Pantham <pantham1@surface86.llnl.gov> 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 L. Lee <lee218@cab687.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@cab690.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@catalyst159.llnl.gov> Gregory L. Lee <lee218@llnl.gov> Gregory Lee <lee218@llnl.gov> +Massimiliano Culpo <massimiliano.culpo@epfl.ch> Massimiliano Culpo <massimiliano.culpo@googlemail.com> +Massimiliano Culpo <massimiliano.culpo@epfl.ch> alalazo <massimiliano.culpo@googlemail.com> +Mark Miller <miller86@llnl.gov> miller86 <miller86@llnl.gov> |