summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-07-16 20:40:45 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-07-16 20:40:45 +0900
commita389a22813ecf48a9a657c423c7704fe8999d0a5 (patch)
tree2d23d82e9502f8c573daf4d4d49a5d81d5f98a4e /.mailmap
parent0c191c0a477f5d5cba5828e44999952ba0b09f68 (diff)
downloadenlightenment-a389a22813ecf48a9a657c423c7704fe8999d0a5.tar.gz
mailmap: keep in sync with elementary and efl's mailmaps.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1578b84113..39f4c6088d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -55,3 +55,10 @@ 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>
+Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
+Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
+Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
+Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
+Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>