X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=.mailmap;h=bcbc2c7cd1e87b194102e621999befe8aac6e854;hb=bfd2978e5796584c162e6b6912f9ba0145068653;hp=6aa5986c5bf4a88d6ecad283995e037339bb2b23;hpb=0dbc7d410982aae19d912b414f46ef79fb4175f1;p=vlc

diff --git a/.mailmap b/.mailmap
index 6aa5986c5b..bcbc2c7cd1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,8 @@ Jean-Baptiste Kempf <jb@videolan.org>
 <jb@videolan.org> <jb@elayne.jbkempf.com>
 <jb@videolan.org> <Jean-Baptiste@ambre.(none)>
 <jb@videolan.org> <jb@sasmira.(none)>
+Jean-Baptiste Kempf <jb@vidoelan.org> U-AMBRE\Jean-Baptiste <Jean-Baptiste@ambre.(none)>
+Jean-Baptiste Kempf <jb@vidoelan.org> U-SASMIRA\jb <jb@sasmira.(none)>
 <rem@videolan.org> <remi.denis-courmont@nokia.com>
 <pdherbemont@videolan.org> <steg@nibudy.local>
 <dionoea@videolan.org> <antoine@macbook.(none)>
@@ -55,6 +57,7 @@ Basos G <noxelia@gmail.com> <noxelia 4t gmail c0m>
 <kelemeng@gnome.hu> <kelemeng at gnome dot hu>
 <tkrotoff@gmail.com> <tkrotoff at>
 Aurélien Nephtali <aurelien@sitadelle.com> <aurelien sitadelle.com>
+Aurélien Nephtali <aurelien.nephtali@gmail.com>
 Konstanty Bialkowski <konstanty@ieee.org> <konstanty@gmail.com>
 Pavlov Konstantin <thresh@videolan.org>
 <thresh@videolan.org> <thresh@altlinux.ru>
@@ -74,8 +77,10 @@ Hugo Beauzée-Luyssen <beauze.h@gmail.com>
 Nicolas Chauvet <kwizart@gmail.com>
 Rob Jonson <rob@hobbyistsoftware.com>
 Sigmund Augdal Helberg <sigmunau@videolan.org>
+Sigmund Augdal Helberg <sigmunau@videolan.org> Sigmund Augdal <sigmund@snap.tv>
+Sigmund Augdal Helberg <sigmunau@videolan.org> Sigmund Augdal <sigmunau@hobbes.(none)>
 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
-Anthony Loiseau <thannoy@actech-innovation.com>
+Anthony Loiseau <anthony.loiseau@gmail.com> <thannoy@actech-innovation.com>
 FUJISAWA Tooru <arai_a@mac.com>
 Ken Self <kenself@optusnet.com.au>
 Tony Gaillard <tony.gaillard@supinfo.com> <Tony.GAILLARD@supinfo.com>
@@ -83,11 +88,45 @@ Przemyslaw Fiala <bl4@playker.info>
 Marián Hikaník <podnety@mojepreklady.net>
 Michael McEll <mapei_@hotmail.com>
 Marian Ďurkovič <md@bts.sk>
+Marian Ďurkovič <md@bts.sk> Marian Durkovic <md@videolan.org>
+#Maybe switch to the videolan address?
 Dylan Yudaken <dyudaken@gmail.com>
 Martin T. H. Sandsmark <sandsmark@samfundet.no>
+<cyril.mathe@gmail.com> <cmathe@actech-innovation.com>
+<riquedafreak@videolan.org> <enrique.osuna@gmail.com>
+<nib9@charter.net> <zaggal69@gmail.com>
+Alexander Law <exclusion@gmail.com>
+Denis Arnaud <denisarnuad@yahoo.fr>
+Éric Lassauge <lassauge@users.sf.net>
+Faustino Osuna <riquedafreak@videolan.org>
+Faustino Osuna <riquedafreak@videolan.org> Faustino E. Osuna <enrique.osuna@gmail.com>
+Mihkel Kirjutas <turakas@gmail.com>
+Naohiro Koriyama <nkoriyama@gmail.com>
+Predrag Ljubenović <predragljubenovic@gmail.com>
+Ajith Manjula Senarathne <uthmax.sms@gmail.com>
+Andy Chenee <chenee543216@gmail.com>
+<chenee543216@gmail.com> Andy Chenee <chenee@hhcn.com>
+Dominko Azdajic <domazd@mail.ru> Dominko Aždajić <domazd@web.de>
+Jérôme Decoodt <djc@videolan.org>
+Jérôme Decoodt <djc@videolan.org> Jérôme Decoodt <djc+git@videolan.org>
+Matej Urban <matej.urban@gmail.com> Matej Urbančič <mateju@svn.gnome.org>
+Xabier Aramendi <azpidatziak@gmail.com>
+Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
+Frédéric Yhuel <fyhuel@viotech.net>
+Ming Hu <tewilove@gmail.com>
+Kuan-Chung Chiu <buganini@gmail.com>
+Cédric Cocquebert <cedric.cocquebert@cea.fr>
+François Cartegnie <fcvlcdev@free.fr>
+Jean-Paul Saman <jpsaman@videolan.org>
+Jean-Paul Saman <jpsaman@videolan.org> jpsaman@m2x.nl <jpsaman@m2x.nl>
+Jean-Paul Saman <jpsaman@videolan.org> Jean-Paul Saman <jean-paul.saman@m2x.nl>
+Samuel Hocevar <sam@videolan.org>
+Samuel Hocevar <sam@videolan.org> Sam Hocevar <sam@zoy.org>
+Samuel Hocevar <sam@videolan.org> Sam Hocevar <sam@hocevar.net>
+Yannick Bréhon <y.brehon@qiplay.com>
 #
 # Preferred emails
-<malte@tancred.com.> <malte@frontbase.com>
+<malte@tancred.com> <malte@frontbase.com>
 <xtophe@videolan.org> <xtophe@chewa.net>
 <hartman@videolan.org> <hartman@veda.student.utwente.nl>
 <etix@videolan.org> <etix@l0cal.com>