diff options
| author | Peter Scheibel <scheibel1@llnl.gov> | 2016-01-19 17:27:18 -0800 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2016-01-19 17:27:18 -0800 |
| commit | 965af75d23b356b44918f815b0e7ef14bdedcba3 (patch) | |
| tree | bef1b0dea7314aef95982fe2f1811768d812aaac /.mailmap | |
| parent | d22cf1aed1d033610481cb451909c93916848ccc (diff) | |
| parent | 9be37da077158c43eb0c2f6b190773772dfa9ef5 (diff) | |
| download | spack-965af75d23b356b44918f815b0e7ef14bdedcba3.tar.gz spack-965af75d23b356b44918f815b0e7ef14bdedcba3.tar.bz2 spack-965af75d23b356b44918f815b0e7ef14bdedcba3.tar.xz spack-965af75d23b356b44918f815b0e7ef14bdedcba3.zip | |
Merge branch 'develop' into features/boost-additive-libs
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> |