summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-01-28 13:46:18 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-01-28 13:46:18 -0800
commitda6b44459287349e1949c601a12fa5ccda07572a (patch)
tree6881500f1a52db2e3b2b2a48076e93e7a661f621 /.mailmap
parentda929c86696787f91c1cee775b158faeb23a9b50 (diff)
downloadscala-da6b44459287349e1949c601a12fa5ccda07572a.tar.gz
scala-da6b44459287349e1949c601a12fa5ccda07572a.tar.bz2
scala-da6b44459287349e1949c601a12fa5ccda07572a.zip
update mailmap
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 810bda030c..7cab5ed019 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,6 +10,7 @@ Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <aleksandar@lampmac14.epfl.ch>
Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <axel22@gmail.com>
Alex Cruise <alex@cluonflux.com>
Alex Cruise <alex@cluonflux.com> <alex@metaforsoftware.com>
+A. P. Marki <som.snytt@gmail.com>
Antonio Cunei <antonio.cunei@typesafe.com>
Antonio Cunei <antonio.cunei@typesafe.com> <antonio.cunei@epfl.ch>
Buraq Emir <buraq@epfl.ch>
@@ -71,5 +72,6 @@ Unknown Committer <lost.soul@typesafe.com> <USER@epfl.ch>
Unknown Committer <lost.soul@typesafe.com> <noreply@epfl.ch>
Viktor Klang <viktor.klang@gmail.com>
Vincent Cremet <cremet@epfl.ch>
+Vladimir Nikolaev <vladimir.nikolaev9@gmail.com>
Vojin Jovanovic <vojin.jovanovic@epfl.ch>
Vojin Jovanovic <vojin.jovanovic@epfl.ch> <gvojin@gmail.com>