vlc | branch: master | Christoph Miebach <[email protected]> | Thu Mar  
8 11:12:22 2012 +0100| [e509433c1517494fbde32ded8c9101f12102029b] | committer: 
Jean-Baptiste Kempf

More mailmap fixes and simplifications

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

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

 .mailmap |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/.mailmap b/.mailmap
index af449e1..3ae7436 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,7 +98,8 @@ Alexander Law <[email protected]>
 Denis Arnaud <[email protected]>
 Éric Lassauge <[email protected]>
 Faustino Osuna <[email protected]>
-Mihkel Kirjutas <[email protected]> 
+Faustino Osuna <[email protected]> Faustino E. Osuna 
<[email protected]>
+Mihkel Kirjutas <[email protected]>
 Naohiro Koriyama <[email protected]>
 Predrag Ljubenović <[email protected]>
 Ajith Manjula Senarathne <[email protected]>
@@ -110,6 +111,18 @@ 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]>
+Frédéric Yhuel <[email protected]>
+Ming Hu <[email protected]>
+Kuan-Chung Chiu <[email protected]>
+Cédric Cocquebert <[email protected]>
+François Cartegnie <[email protected]>
+Jean-Paul Saman <[email protected]>
+Jean-Paul Saman <[email protected]> [email protected] <[email protected]>
+Jean-Paul Saman <[email protected]> Jean-Paul Saman <[email protected]>
+Samuel Hocevar <[email protected]>
+Samuel Hocevar <[email protected]> Sam Hocevar <[email protected]>
+Samuel Hocevar <[email protected]> Sam Hocevar <[email protected]>
+Yannick Bréhon <[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