aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-03-10 14:53:46 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-03-12 14:08:01 +0900
commitbf7579ebe69328db135171ef4e62228025efd124 (patch)
tree7676c4b04a472539599ed6bc604d3ad0571d50eb /.mailmap
parentevas: @fix use the correct composite op on lines with pixman (diff)
downloadefl-bf7579ebe69328db135171ef4e62228025efd124.tar.gz
mailmap: Add myself and unify my email addresses
I didn't set up my personal laptop with my work email :)
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1578b84113..b2d84f69df 100644
--- a/.mailmap
+++ b/.mailmap
@@ -55,3 +55,5 @@ Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive
Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com>
Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
+Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
+Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>