diff options
| author | bors <bors@rust-lang.org> | 2019-05-06 10:42:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-06 10:42:19 +0000 |
| commit | d98a165e39a3634eeac2b1f35c81560f5a7e8ded (patch) | |
| tree | a064b0516a4a032f3bc4afa698cfdd0ca9f8a47f | |
| parent | 7ac02005f3d7ac4b2c32b82dde365107aa2aafdf (diff) | |
| parent | 91e0c253ed03f9ad58573f85553e635d8d9d69a7 (diff) | |
| download | rust-d98a165e39a3634eeac2b1f35c81560f5a7e8ded.tar.gz rust-d98a165e39a3634eeac2b1f35c81560f5a7e8ded.zip | |
Auto merge of #60565 - Mark-Simulacrum:mailmap-fixes, r=pietroalbini
Update mailmap to proper syntax Also updates my entry to the proper name
| -rw-r--r-- | .mailmap | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap index 120d1f1457e..679e9d79847 100644 --- a/.mailmap +++ b/.mailmap @@ -53,7 +53,8 @@ Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccer Chris Pressey <cpressey@gmail.com> Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com> Chris Vittal <christopher.vittal@gmail.com> Christopher Vittal <christopher.vittal@gmail.com> -Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com> <cn.poveda.ruiz@gmail.com> +Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com> +Christian Poveda <christianpoveda@protonmail.com> <cn.poveda.ruiz@gmail.com> Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com> Clinton Ryan <clint.ryan3@gmail.com> Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net> @@ -79,7 +80,9 @@ Eric Holk <eric.holk@gmail.com> <eholk@mozilla.com> Eric Holmes <eric@ejholmes.net> Eric Reed <ecreed@cs.washington.edu> <ereed@mozilla.com> Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org> -Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com> <esteban@commure.com> <github@kuber.com.ar> +Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com> +Esteban Küber <esteban@kuber.com.ar> <esteban@commure.com> +Esteban Küber <esteban@kuber.com.ar> <github@kuber.com.ar> Evgeny Sologubov Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de> Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org> @@ -146,7 +149,7 @@ NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com> NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com> Marcell Pardavi <marcell.pardavi@gmail.com> Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew> -Mark Simulacrum <mark.simulacrum@gmail.com> +Mark Rousskov <mark.simulacrum@gmail.com> Mark Sinclair <mark.edward.x@gmail.com> Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com> Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com> @@ -226,7 +229,7 @@ Tim Joseph Dumol <tim@timdumol.com> Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com> Ty Overby <ty@pre-alpha.com> Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss> -Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> bluss <bluss> +Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost> Vadim Petrochenkov <vadim.petrochenkov@gmail.com> Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com> |