aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap3
-rw-r--r--Documentation/AUTHORS.md6
2 files changed, 6 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index ef1b5fb..83da2db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,6 @@
Alex Dunn <adunn@ucsb.edu> <dunn.alex@gmail.com>
Alex Ott <alexott@gmail.com> <ott@flash.lan>
+Allen Li <darkfeline@felesatra.moe>
Andriy Kmit' <dev@madand.net>
Bar Magal <bmagamb@gmail.com>
Benjamin Motz <benjamin.motz@mailbox.org> <Benjamin.Motz@3ds.com>
@@ -10,8 +11,10 @@ Christophe Junke <junke.christophe@gmail.com> <christophe.junke@parrot.com>
Damien Cassou <damien@cassou.me> <damien.cassou@gmail.com>
Daniel Fleischer <danflscr@gmail.com> danielfleischer <daniel.fleischer@amobee.com>
David Abrahams <dave@boostpro.com>
+David Ellison <davidehellison@gmail.com> <davide@voicebox.com>
Dean Kariniemi <8913263+d3k4r@users.noreply.github.com>
Dennis Paskorz <dennis@walltowall.com>
+Dominique Quatravaux <dominique.quatravaux@epfl.ch> <domq@google.com>
Evan Torrie <etorrie@gmail.com> <evantorrie@users.noreply.github.com>
Evgkeni Sampelnikof <esabof@gmail.com> <faceoffuture@yahoo.gr>
Evgkeni Sampelnikof <esabof@gmail.com> <sabof@example.com>
diff --git a/Documentation/AUTHORS.md b/Documentation/AUTHORS.md
index dc4f709..7f70f7a 100644
--- a/Documentation/AUTHORS.md
+++ b/Documentation/AUTHORS.md
@@ -57,7 +57,6 @@ Contributors
- Alexey Voinov <alexey.v.voinov@gmail.com>
- Alex Kost <alezost@gmail.com>
- Alex Ott <alexott@gmail.com>
-- Allen <darkfeline@felesatra.moe>
- Allen Li <darkfeline@felesatra.moe>
- Andreas Fuchs <asf@boinkor.net>
- Andreas Liljeqvist <andreas.liljeqvist@robacks.se>
@@ -121,7 +120,6 @@ Contributors
- Dato Simó <dato@net.com.org.es>
- David Abrahams <dave@boostpro.com>
- David Ellison <davidehellison@gmail.com>
-- David Ellison <davide@voicebox.com>
- David Hull <david.hull@openx.com>
- David L. Rager <ragerdl@gmail.com>
- David Wallin <david.wallin@gmail.com>
@@ -129,7 +127,6 @@ Contributors
- Dennis Paskorz <dennis@walltowall.com>
- Divye Kapoor <divye@google.com>
- Dominique Quatravaux <dominique.quatravaux@epfl.ch>
-- Dominique Quatravaux <domq@google.com>
- Duianto Vebotci <vebotci@openmailbox.org>
- Eli Barzilay <eli@barzilay.org>
- Eric Davis <ed@npri.org>
@@ -276,6 +273,7 @@ Contributors
- Peter Jaros <peter.a.jaros@gmail.com>
- Peter J. Weisberg <pj@irregularexpressions.net>
- Peter Vasil <mail@petervasil.net>
+- Philippe Cavalaria <philippe.cavalaria@gmail.com>
- Philippe Vaucher <philippe.vaucher@gmail.com>
- Philipp Fehre <pfehre@twitter.com>
- Philipp Haselwarter <philipp@haselwarter.org>
@@ -319,6 +317,7 @@ Contributors
- Sergey Pashinin <sergey@pashinin.com>
- Sergey Vinokurov <serg.foo@gmail.com>
- Servilio Afre Puentes <afrepues@mcmaster.ca>
+- Siavash Askari Nasr <siavash.askari.nasr@gmail.com>
- Silent Sphere <silentsphere110@gmail.com>
- Simon Pintarelli <simon.pintarelli@cscs.ch>
- Štěpán Němec <stepnem@gmail.com>
@@ -333,6 +332,7 @@ Contributors
- Szunti <Szunti@users.noreply.github.com>
- Takafumi Arakaki <aka.tkf@gmail.com>
- Tassilo Horn <tsdh@gnu.org>
+- TEC <tec@tecosaur.com>
- Teemu Likonen <tlikonen@iki.fi>
- Teruki Shigitani <teruki.shigitani@gmail.com>
- Thierry Volpiatto <thievol@posteo.net>