diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-20 19:13:33 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-20 19:13:33 -0800 |
commit | 27643546e8eb4d2c5da6fc30a998e7ee799defcc (patch) | |
tree | 2480f714bcc3a1a5e1e0ecda7a476c3b7a3a4972 /.mailmap | |
parent | 11ba640ebe3cffc1f6671e799ce2b14964f29b31 (diff) | |
parent | 106ca1b6767c60912b6726eeb1d435f6e22a025f (diff) | |
download | scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.tar.gz scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.tar.bz2 scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.zip |
Merge pull request #1794 from paulp/merge-2.10.x
Merge 2.10.x into master.
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -1,7 +1,27 @@ +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> +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> +Luc Bourlier <skyluc@epfl.ch> +Martin Odersky <odersky@gamil.com> +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> +Stéphane Micheloud <michelou@epfl.ch> |