From a3a2c49e13e23e95a5c2a87df0339e1263ebaedc Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 16 Sep 2019 18:43:25 +0200
Subject: [PATCH] =?UTF-8?q?.mailmap:=20update=20aliases=20for=20Carl-Phili?=
 =?UTF-8?q?p=20H=C3=A4nsch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1999>
---
 .mailmap | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 5d2a1ce687693..94825b49fc474 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,9 +102,10 @@ Bruce Cherniak <bruce.cherniak@intel.com>
 
 Bruce Merry <bmerry@users.sourceforge.net> <bmerry@gmail.com>
 
-Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <s3734770@mail.zih.tu-dresden.de>
-Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <carli@carli-laptop.(none)>
-Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <Carl-Philip.Haensch@mailbox.tu-dresden.de>
+Carl-Philip Hänsch <cphaensch@googlemail.com>
+Carl-Philip Hänsch <cphaensch@googlemail.com> <s3734770@mail.zih.tu-dresden.de>
+Carl-Philip Hänsch <cphaensch@googlemail.com> <carli@carli-laptop.(none)>
+Carl-Philip Hänsch <cphaensch@googlemail.com> <Carl-Philip.Haensch@mailbox.tu-dresden.de>
 
 Chad Versace <chadversary@chromium.org> <chad@kiwitree.net>
 Chad Versace <chadversary@chromium.org> <chad@chad-versace.us>