]> git.sesse.net Git - vlc/commitdiff
Update mailmap
authorJean-Baptiste Kempf <jb@videolan.org>
Wed, 3 Oct 2012 13:29:56 +0000 (15:29 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 3 Oct 2012 13:29:56 +0000 (15:29 +0200)
.mailmap

index 62407d6fa681f4964053a82ae9c21d55959db555..717463ef204f44114e68eb9bd883668bb48b8cc6 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -112,7 +112,7 @@ 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>
+Gwenole Beauchesne <gb.devel@gmail.com> <gbeauchesne@splitted-desktop.com>
 Frédéric Yhuel <fyhuel@viotech.net>
 Ming Hu <tewilove@gmail.com>
 Kuan-Chung Chiu <buganini@gmail.com>
@@ -132,3 +132,5 @@ Rui Zhang <bbcallen@gmail.com>
 <xtophe@videolan.org> <xtophe@chewa.net>
 <hartman@videolan.org> <hartman@veda.student.utwente.nl>
 <etix@videolan.org> <etix@l0cal.com>
+<steven@m20.nl> <skramer@inbeeld.eu>
+<jarmo.torvinen@iki.fi> <jarmo.torvinen@jutel.fi>