summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:48:48 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commitcd4dfc157b22829db913c513f794792d43818624 (patch)
treebe6cff02ded3c11abafe76eb45c25c32695a22df /.mailmap
parent9e34049e46efd604990995c3bf162294a2d2123e (diff)
downloadmesa-cd4dfc157b22829db913c513f794792d43818624.tar.gz
mesa-cd4dfc157b22829db913c513f794792d43818624.tar.bz2
mesa-cd4dfc157b22829db913c513f794792d43818624.zip
.mailmap: resolve duplicates for Christopher Li
Signed-off-by: Andres Gomez <agomez@igalia.com> Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c34f18004bf..791ef43a93e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -146,6 +146,9 @@ Christoph Haag <haagch@frickel.club> <haagch+mesadev@frickel.club>
Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Christopher James Halse Rogers <raof@ubuntu.com>
+Christopher Li <chrisl@vmware.com> Chris Li <chrisl@vmware.com>
+Christopher Li <chrisl@vmware.com> Qicheng Christopher Li <chrisl@vmware.com>
+
Claudio Ciccani <klan@directfb.org> <klan@users.sf.net>
Claudio Ciccani <klan@directfb.org> <klan@users.sourceforge.net>