summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-06-22 14:45:04 +0200
committerMarek Olšák <marek.olsak@amd.com>2016-06-22 14:45:52 +0200
commit5d85a21feee0a3cc11b2121b161c097bd8fb6b3f (patch)
tree3f36002737fe28d3383b198d6d8deccf122938b2 /.mailmap
parent356ea9a8da45fe5f0fb5712ffb763130b96489f1 (diff)
downloadexternal_mesa3d-5d85a21feee0a3cc11b2121b161c097bd8fb6b3f.zip
external_mesa3d-5d85a21feee0a3cc11b2121b161c097bd8fb6b3f.tar.gz
external_mesa3d-5d85a21feee0a3cc11b2121b161c097bd8fb6b3f.tar.bz2
.mailmap: fix my main address
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 3c4add7..c614dec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -274,7 +274,7 @@ Marc Dietrich <marvin24@gmx.de> marvin24 <marvin24@gmx.de>
Marcin Ślusarz <marcin.slusarz@gmail.com> Marcin Slusarz <marcin.slusarz@gmail.com>
-Marek Olšák <marek.olsak@amd.com> <maraeo@gmail.com>
+Marek Olšák <maraeo@gmail.com> <marek.olsak@amd.com>
Mario Kleiner <mario.kleiner.de@gmail.com> kleinerm <mario.kleiner@tuebingen.mpg.de>
Mario Kleiner <mario.kleiner.de@gmail.com> <mario.kleiner@tuebingen.mpg.de>