From 152946e60232b73833885f1c612ab1245592172c Mon Sep 17 00:00:00 2001
From: Daniel Juyung Seo <seojuyung2@gmail.com>
Date: Wed, 16 Jul 2014 20:38:58 +0900
Subject: mailmap: updated Tae-hwan Kim's mailmap again and keep in sync with
 efl/enlightenment's mailmaps.

Special thanks to Stefan for the advice.
---
 .mailmap | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.mailmap')

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
 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>
-bluezery <ohpowel@gmail.com> Tae-Hwan Kim <the81.kim@samsung.com>
+Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
+Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
-- 
cgit v1.2.1