diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-03-22 15:57:35 +0100 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-03-22 15:57:35 +0100 |
| commit | 6e847b7d76acf2fb6cda3ef251c311c011008d40 (patch) | |
| tree | 60beafd21cc2f45a6acfbaa2de7301b3d98729a1 /.mailmap | |
| parent | 4b22c2406c163c83998de8938b5fefa18886057e (diff) | |
| parent | e32eb7e990119288e0bbffe1786b5cd20547e0ad (diff) | |
| download | spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.gz spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.bz2 spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.xz spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into qa/coding_standard
Conflicts:
.travis.yml
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> |