summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 49d5dc6629..1b33a40de9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,8 +1,8 @@
+Aleksandar Prokopec <aleksandar.prokopec@epfl.ch>
Aleksandar Prokopec <aleksandar@aleksandar-Latitude-E6500.(none)>
-Aleksandar Prokopec <aleksandar@htpc.(none)>
Aleksandar Prokopec <aleksandar@htpc-axel22.(none)>
+Aleksandar Prokopec <aleksandar@htpc.(none)>
Aleksandar Prokopec <aleksandar@lampmac14.epfl.ch>
-Aleksandar Prokopec <aleksandar.prokopec@epfl.ch>
Antonio Cunei <antonio.cunei@typesafe.com>
Caoyuan Deng <dcaoyuan@epfl.ch>
Chris Hodapp <clhodapp1@gmail.com>
@@ -10,6 +10,7 @@ Chris James <chrisJames@epfl.ch>
Christopher Vogt <vogt@epfl.ch>
Damien Obristi <damien.obrist@gmail.com>
Daniel C. Sobral <dcs@dcs-132-CK-NF79.(none)>
+Daniel C. Sobral <dcs@dcs-132-CK-NF79.(none)>
Ilya Sergei <ilyas@epfl.ch>
Ingo Maier <ingoem@gmail.com>
Kenji Yoshida <6b656e6a69@gmail.com>
@@ -19,6 +20,7 @@ Nada Amin <amin@epfl.ch>
Nada Amin <nada.amin@epfl.ch>
Natallie Baikevich <lu-a-jalla@ya.ru>
Pavel Pavlov <pavel.e.pavlov@gmail.com>
+Pavel Pavlov <pavel.e.pavlov@gmail.com>
Philipp Haller <philipp.haller@typesafe.com>
Roland Kuhn <rk@rkuhn.info>
RĂ¼diger Klaehn <rklaehn@gmail.com>