summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@ubuntu.com>2016-05-13 12:27:45 +0200
committerMaarten Lankhorst <maarten.lankhorst@ubuntu.com>2016-05-13 12:28:05 +0200
commitff5c3126235804e963abaa94e5ea50d1295cdd5f (patch)
tree5b57888bf73f52787f872cc7951f32fd9e5cc58b /.mailmap
parenta694c20ecf10fd266d27b8d216794dfa5e19f633 (diff)
downloadexternal_mesa3d-ff5c3126235804e963abaa94e5ea50d1295cdd5f.zip
external_mesa3d-ff5c3126235804e963abaa94e5ea50d1295cdd5f.tar.gz
external_mesa3d-ff5c3126235804e963abaa94e5ea50d1295cdd5f.tar.bz2
.mailmap: Fix my email addresses.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 0d6ab33..373ca56 100644
--- a/.mailmap
+++ b/.mailmap
@@ -262,8 +262,9 @@ Li Peng <peng.li@intel.com> <peng.li@linux.intel.com>
Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>
-Maarten Lankhorst <maarten.lankhorst@canonical.com> <dev@mblankhorst.nl>
-Maarten Lankhorst <maarten.lankhorst@canonical.com> <m.b.lankhorst@gmail.com>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <dev@mblankhorst.nl>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <m.b.lankhorst@gmail.com>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <maarten.lankhorst@canonical.com>
Maciej Cencora <m.cencora@gmail.com> <maciej@osiris.(none)>