summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-07-16 20:39:56 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-07-16 20:39:56 +0900
commitc683e16dc43c3860c13eb37de85b75e25e76b043 (patch)
treeeaee2af680c0833be95a35eb6dd11161ca025640 /.mailmap
parent8ee6e168deb8553810749bb0615ab508b2bffff1 (diff)
mailmap: keep in sync with elementary and enlightenment's mailmaps.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 5 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b2d84f6..39f4c60 100644
--- a/.mailmap
+++ b/.mailmap
@@ -57,3 +57,8 @@ Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail
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> 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> 59Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
60Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
61Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
62Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
63Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
64Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>