[vlc-commits] Improving .mailmap

[Christoph Miebach]

vlc/vlc-2.0 | branch: master | Christoph Miebach <christoph.miebach at web.de> | Wed Mar  7 01:18:00 2012 +0100| [f3b86d685086a49daf3a33cc38f2239f50f55530] | committer: Jean-Baptiste Kempf

Improving .mailmap

Mapping some contributors to the same email, fixing jb adresses and trying to
pick the "right" name when 2 are used by the same person

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit dc28b94159fec2deba1b5ea1d1b4a1d3ddbe79c7)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f3b86d685086a49daf3a33cc38f2239f50f55530
---

 .mailmap |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index 6ad2b54..af449e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,8 @@ Jean-Baptiste Kempf <jb at videolan.org>
 <jb at videolan.org> <jb at elayne.jbkempf.com>
 <jb at videolan.org> <Jean-Baptiste at ambre.(none)>
 <jb at videolan.org> <jb at sasmira.(none)>
+Jean-Baptiste Kempf <jb at vidoelan.org> U-AMBRE\Jean-Baptiste <Jean-Baptiste at ambre.(none)>
+Jean-Baptiste Kempf <jb at vidoelan.org> U-SASMIRA\jb <jb at sasmira.(none)>
 <rem at videolan.org> <remi.denis-courmont at nokia.com>
 <pdherbemont at videolan.org> <steg at nibudy.local>
 <dionoea at videolan.org> <antoine at macbook.(none)>
@@ -74,6 +76,8 @@ Hugo Beauzée-Luyssen <beauze.h at gmail.com>
 Nicolas Chauvet <kwizart at gmail.com>
 Rob Jonson <rob at hobbyistsoftware.com>
 Sigmund Augdal Helberg <sigmunau at videolan.org>
+Sigmund Augdal Helberg <sigmunau at videolan.org> Sigmund Augdal <sigmund at snap.tv>
+Sigmund Augdal Helberg <sigmunau at videolan.org> Sigmund Augdal <sigmunau at hobbes.(none)>
 Vincent Penquerc'h <ogg.k.ogg.k at googlemail.com>
 Anthony Loiseau <anthony.loiseau at gmail.com> <thannoy at actech-innovation.com>
 FUJISAWA Tooru <arai_a at mac.com>
@@ -83,11 +87,29 @@ Przemyslaw Fiala <bl4 at playker.info>
 Marián Hikaník <podnety at mojepreklady.net>
 Michael McEll <mapei_ at hotmail.com>
 Marian Ďurkovič <md at bts.sk>
+Marian Ďurkovič <md at bts.sk> Marian Durkovic <md at videolan.org>
+#Maybe switch to the videolan address?
 Dylan Yudaken <dyudaken at gmail.com>
 Martin T. H. Sandsmark <sandsmark at samfundet.no>
 <cyril.mathe at gmail.com> <cmathe at actech-innovation.com>
 <riquedafreak at videolan.org> <enrique.osuna at gmail.com>
 <nib9 at charter.net> <zaggal69 at gmail.com>
+Alexander Law <exclusion at gmail.com>
+Denis Arnaud <denisarnuad at yahoo.fr>
+Éric Lassauge <lassauge at users.sf.net>
+Faustino Osuna <riquedafreak at videolan.org>
+Mihkel Kirjutas <turakas at gmail.com> 
+Naohiro Koriyama <nkoriyama at gmail.com>
+Predrag Ljubenović <predragljubenovic at gmail.com>
+Ajith Manjula Senarathne <uthmax.sms at gmail.com>
+Andy Chenee <chenee543216 at gmail.com>
+<chenee543216 at gmail.com> Andy Chenee <chenee at hhcn.com>
+Dominko Azdajic <domazd at mail.ru> Dominko Aždajić <domazd at web.de>
+Jérôme Decoodt <djc at videolan.org>
+Jérôme Decoodt <djc at videolan.org> Jérôme Decoodt <djc+git at videolan.org>
+Matej Urban <matej.urban at gmail.com> Matej Urbančič <mateju at svn.gnome.org>
+Xabier Aramendi <azpidatziak at gmail.com>
+Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
 #
 # Preferred emails
 <malte at tancred.com> <malte at frontbase.com>