vlc/vlc-2.0 | branch: master | Christoph Miebach <[email protected]> | 
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 <[email protected]>
(cherry picked from commit dc28b94159fec2deba1b5ea1d1b4a1d3ddbe79c7)

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> 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 <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <Jean-Baptiste@ambre.(none)>
 <[email protected]> <jb@sasmira.(none)>
+Jean-Baptiste Kempf <[email protected]> U-AMBRE\Jean-Baptiste 
<Jean-Baptiste@ambre.(none)>
+Jean-Baptiste Kempf <[email protected]> U-SASMIRA\jb <jb@sasmira.(none)>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <antoine@macbook.(none)>
@@ -74,6 +76,8 @@ Hugo Beauzée-Luyssen <[email protected]>
 Nicolas Chauvet <[email protected]>
 Rob Jonson <[email protected]>
 Sigmund Augdal Helberg <[email protected]>
+Sigmund Augdal Helberg <[email protected]> Sigmund Augdal <[email protected]>
+Sigmund Augdal Helberg <[email protected]> Sigmund Augdal 
<sigmunau@hobbes.(none)>
 Vincent Penquerc'h <[email protected]>
 Anthony Loiseau <[email protected]> <[email protected]>
 FUJISAWA Tooru <[email protected]>
@@ -83,11 +87,29 @@ Przemyslaw Fiala <[email protected]>
 Marián Hikaník <[email protected]>
 Michael McEll <[email protected]>
 Marian Ďurkovič <[email protected]>
+Marian Ďurkovič <[email protected]> Marian Durkovic <[email protected]>
+#Maybe switch to the videolan address?
 Dylan Yudaken <[email protected]>
 Martin T. H. Sandsmark <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+Alexander Law <[email protected]>
+Denis Arnaud <[email protected]>
+Éric Lassauge <[email protected]>
+Faustino Osuna <[email protected]>
+Mihkel Kirjutas <[email protected]> 
+Naohiro Koriyama <[email protected]>
+Predrag Ljubenović <[email protected]>
+Ajith Manjula Senarathne <[email protected]>
+Andy Chenee <[email protected]>
+<[email protected]> Andy Chenee <[email protected]>
+Dominko Azdajic <[email protected]> Dominko Aždajić <[email protected]>
+Jérôme Decoodt <[email protected]>
+Jérôme Decoodt <[email protected]> Jérôme Decoodt <[email protected]>
+Matej Urban <[email protected]> Matej Urbančič <[email protected]>
+Xabier Aramendi <[email protected]>
+Gwenole Beauchesne <[email protected]>
 #
 # Preferred emails
 <[email protected]> <[email protected]>

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to