summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-11-20 17:47:39 -0800
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-11-20 17:47:39 -0800
commitdf576c8369e70efc595abd3b74304eaeda4569ab (patch)
treeaddd561964a5cd75e3ec165ea67dc79634dc2beb /.mailmap
parentb10cd2d50685602238277eceb2d6c22943839cca (diff)
parent1236f27ac14c293b7a3dbc6368ca2d9f01dd2cb5 (diff)
downloadscala-df576c8369e70efc595abd3b74304eaeda4569ab.tar.gz
scala-df576c8369e70efc595abd3b74304eaeda4569ab.tar.bz2
scala-df576c8369e70efc595abd3b74304eaeda4569ab.zip
Merge pull request #1598 from dcsobral/mailmap
Associate correct names to e-mails, correct or not
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..1927f85d2e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Aleksandar Prokopec <aleksandar@aleksandar-Latitude-E6500.(none)>
+Aleksandar Prokopec <aleksandar@htpc.(none)>
+Aleksandar Prokopec <aleksandar@htpc-axel22.(none)>
+Aleksandar Prokopec <aleksandar@lampmac14.epfl.ch>
+Aleksandar Prokopec <aleksandar.prokopec@epfl.ch>
+Daniel C. Sobral <dcs@dcs-132-CK-NF79.(none)>
+Pavel Pavlov <pavel.e.pavlov@gmail.com>