diff options
| -rw-r--r-- | .mailmap | 6 | ||||
| -rw-r--r-- | AUTHORS.txt | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap index 233e55e83d0..8eaf8f16e4b 100644 --- a/.mailmap +++ b/.mailmap @@ -13,6 +13,7 @@ Alex Burka <durka42+github@gmail.com> Alex Burka <aburka@seas.upenn.edu> Alex Lyon <arcterus@mail.com> <Arcterus@mail.com> Alex Newman <posix4e@gmail.com> Alex HotShot Newman <posix4e@gmail.com> Alex Rønne Petersen <alex@lycus.org> +Alfie John <alfie@alfie.wtf> Alfie John <alfiej@fastmail.fm> Andreas Gal <gal@mozilla.com> <andreas.gal@gmail.com> Andrew Kuchev <0coming.soon@gmail.com> Andrew <0coming.soon@gmail.com> Andrew Poelstra <asp11@sfu.ca> <apoelstra@wpsoftware.net> @@ -21,6 +22,7 @@ Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> arielb1 <arielb1@mail.tau.ac.il> Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> Ariel Ben-Yehuda <ariel.byd@gmail.com> Austin Seipp <mad.one@gmail.com> <as@hacks.yi.org> Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com> +Ben Sago <ogham@users.noreply.github.com> Ben S <ogham@bsago.me> Ben S <ogham@users.noreply.github.com> Benjamin Jackman <ben@jackman.biz> Björn Steinbrink <bsteinbr@gmail.com> <B.Steinbrink@gmx.de> blake2-ppc <ulrik.sverdrup@gmail.com> <blake2-ppc> @@ -30,6 +32,7 @@ Brian Dawn <brian.t.dawn@gmail.com> Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com> Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com> Carol Willing <carolcode@willingconsulting.com> +Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com> Chris Pressey <cpressey@gmail.com> Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com> Corey Farwell <coreyf+rust@rwell.org> Corey Farwell <coreyf@rwell.org> @@ -105,6 +108,7 @@ Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com> Neil Pankey <npankey@gmail.com> <neil@wire.im> Nicholas Mazzuca <npmazzuca@gmail.com> Nicholas <npmazzuca@gmail.com> Oliver Schneider <github6541940@oli-obk.de> <git1984941651981@oli-obk.de> <git1984941651981@oli-obk.de> Oliver 'ker' Schneider <rust19446194516@oli-obk.de> +Oliver Schneider <github6541940@oli-obk.de> Oliver Schneider <git1984941651981@oli-obk.de> Oliver Schneider <git-spam9815368754983@oli-obk.de> Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com> Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com> Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com> @@ -119,6 +123,7 @@ Rob Arnold <robarnold@cs.cmu.edu> Robert Foss <dev@robertfoss.se> robertfoss <dev@robertfoss.se> Robert Gawdzik <rgawdzik@hotmail.com> Robert Gawdzik ☢ <rgawdzik@hotmail.com> Robert Millar <robert.millar@cantab.net> +Ruud van Asseldonk <dev@veniogames.com> Ruud van Asseldonk <ruuda@google.com> Ryan Scheel <ryan.havvy@gmail.com> Sean Gillespie <sean.william.g@gmail.com> swgillespie <sean.william.g@gmail.com> Seonghyun Kim <sh8281.kim@samsung.com> @@ -135,6 +140,7 @@ Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com> Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost> Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> bluss <bluss> Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com> +Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com> William Ting <io@williamting.com> <william.h.ting@gmail.com> Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com> XuefengWu <benewu@gmail.com> Youngsoo Son <ysson83@gmail.com> <ysoo.son@samsung.com> diff --git a/AUTHORS.txt b/AUTHORS.txt index 58f10df1c46..31f3a9e5bf0 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -150,7 +150,7 @@ Birunthan Mohanathas <birunthan@mohanathas.com> Björn Steinbrink <bsteinbr@gmail.com> Blake Loring <Blake.Loring@ig.com> blake2-ppc <ulrik.sverdrup@gmail.com> -Boris Egorov <egorov@linux.com> +Boris Egorov <jightuse@gmail.com> bors <bors@rust-lang.org> Bouke van der Bijl <boukevanderbijl@gmail.com> Brad King <brad.king@kitware.com> @@ -610,7 +610,7 @@ Joonas Javanainen <joonas.javanainen@gmail.com> Jordan Humphreys <mrsweaters@users.noreply.github.com> Jordan Woehr <jordanwoehr@gmail.com> Jordi Boggiano <j.boggiano@seld.be> -Jorge Aparicio <japaricious@gmail.com> +Jorge Aparicio <japaric@linux.com> Jorge Israel Peña <jorge.israel.p@gmail.com> Joris Rehm <joris.rehm@wakusei.fr> Jormundir <Chaseph@gmail.com> |
