summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-27 09:01:23 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-27 09:01:23 -0700
commit1a3c16fd36407bb2308bbb84739601544ac4a2e5 (patch)
tree843c6766566bb0871436297814ff20ecdce4c33a
parent0aaf59149871f817a67c1fefcc3b0457fcb5e4fc (diff)
parent0fb4d46a8828e42c63de273ae27db62966fc1a53 (diff)
downloadscala-1a3c16fd36407bb2308bbb84739601544ac4a2e5.tar.gz
scala-1a3c16fd36407bb2308bbb84739601544ac4a2e5.tar.bz2
scala-1a3c16fd36407bb2308bbb84739601544ac4a2e5.zip
Merge pull request #2999 from retronym/topic/mailmap-francois
A .mailmap entry for @huitseeker
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e461c0cdf8..810bda030c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Erik Stenman <stenman@epfl.ch>
Eugene Burmako <xeno.by@gmail.com>
Eugene Burmako <xeno.by@gmail.com> <burmako@epfl.ch>
Eugene Vigdorchik <eugenevigdorchik@epfl.ch> <eugene.vigdorchik@gmail.com>
+François Garillot <francois@garillot.net>
Geoff Reedy <geoff@programmer-monk.net> <gereedy@sandia.gov>
Ilya Sergei <ilyas@epfl.ch>
Ingo Maier <ingo.maier@epfl.ch>