summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2014-06-29 19:02:12 +0200
committerBoris Faure <billiob@gmail.com>2014-06-29 19:02:12 +0200
commit46a3342f9a9fa390784193357af5039021a8435c (patch)
tree90fe2d993340952bb8a38bab181fc0227347edb2 /.mailmap
parent9c6d6db43cc520050fd665665174c940ab41cc15 (diff)
update contributors
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1578b84..65360ce 100644
--- a/.mailmap
+++ b/.mailmap
@@ -55,3 +55,6 @@ Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive
55Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com> 55Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com>
56Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com> 56Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
57Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de> 57Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
58Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
59Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
60Wonguk Jeong <wonguk.jeong@samsung.com> wonguk.jeong <wonguk.jeong@samsung.com>