From 7128b5dccf996e8d9bbbe3e4b94c1fd47292264f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 21 Nov 2016 15:36:04 +0100 Subject: [PATCH] .mailmap, CREDITS: Correct Alexandre Emsenhuber's (IAlex) name Change-Id: I129fdefecced2092e201a27af131109c5e253712 --- .mailmap | 6 +++--- CREDITS | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 02cd003bea..dd968e8d08 100644 --- a/.mailmap +++ b/.mailmap @@ -32,9 +32,9 @@ addshore Aditya Sastry Adrian Heine Alex Z. -Alexander Emsenhuber -Alexander Emsenhuber -Alexander Emsenhuber +Alexandre Emsenhuber +Alexandre Emsenhuber +Alexandre Emsenhuber Alexander Monk Alexander Monk Alexander Monk diff --git a/CREDITS b/CREDITS index 1c1cf8795c..d9ff9709f1 100644 --- a/CREDITS +++ b/CREDITS @@ -34,7 +34,6 @@ following names for their contribution to the product. * Alex Ivanov * Alex Shih-Han Lin * Alex Z. -* Alexander Emsenhuber * Alexander I. Mashin * Alexander Lehmann * Alexander Monk -- 2.20.1