summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-07-16 20:38:58 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-07-16 20:39:03 +0900
commit152946e60232b73833885f1c612ab1245592172c (patch)
treea6aa2652f0d56f703424d1fdd239e562a7aad7a7 /.mailmap
parent927babaa4c1affb104fbcf9551f200a140e62ada (diff)
mailmap: updated Tae-hwan Kim's mailmap again and keep in sync with efl/enlightenment's mailmaps.
Special thanks to Stefan for the advice.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 4 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 7983a0cf6..39f4c6088 100644
--- a/.mailmap
+++ b/.mailmap
@@ -55,7 +55,10 @@ 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>
58Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com> 60Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
59Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com> 61Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
60Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com> 62Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
61bluezery <ohpowel@gmail.com> Tae-Hwan Kim <the81.kim@samsung.com> 63Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
64Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>