diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2016-02-12 12:55:26 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2016-02-12 12:55:26 -0500 |
| commit | 64436e77524f317811e27cf4a269b659de441892 (patch) | |
| tree | 3268a403b687736413e172e7957480ba41a62c16 /.mailmap | |
| parent | 9017ec5865615f3e1505501f1eb9b30000e217e9 (diff) | |
| parent | bcf705b85e82509a5045a52a3420893c5546ee7f (diff) | |
| download | spack-64436e77524f317811e27cf4a269b659de441892.tar.gz spack-64436e77524f317811e27cf4a269b659de441892.tar.bz2 spack-64436e77524f317811e27cf4a269b659de441892.tar.xz spack-64436e77524f317811e27cf4a269b659de441892.zip | |
Merge branch 'develop' into correct-cc
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -1,11 +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> |