diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-05-17 17:01:20 +0200 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-17 11:16:39 -0700 |
| commit | b7c352a57f65458c66c78a368f75aaaa4a08e443 (patch) | |
| tree | 4b2b7fcea439948c5de65b05a392091a66eea0a4 /.mailmap | |
| parent | 4f8c306aca703c63282295c9f74f0cb35f9f85d4 (diff) | |
| parent | be405eed9bef9736f0142d6ddf53b6bf8af08696 (diff) | |
| download | scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.tar.gz scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.tar.bz2 scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.zip | |
Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master
================================================================
Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
================================================================
Merge -s ours 4e64a27 ([nomaster commit range])
================================================================
Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 65 |
1 files changed, 57 insertions, 8 deletions
@@ -1,25 +1,74 @@ -Aleksandar Prokopec <aleksandar@aleksandar-Latitude-E6500.(none)> -Aleksandar Prokopec <aleksandar@htpc.(none)> -Aleksandar Prokopec <aleksandar@htpc-axel22.(none)> -Aleksandar Prokopec <aleksandar@lampmac14.epfl.ch> +Adriaan Moors <adriaan.moors@typesafe.com> +Adriaan Moors <adriaan.moors@typesafe.com> <adriaan.moors@epfl.ch> +Adriaan Moors <adriaan.moors@typesafe.com> <adriaanm@gmail.com> Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> +Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <aleksandar.prokopec@gmail.com> +Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <aleksandar@aleksandar-Latitude-E6500.(none)> +Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <aleksandar@htpc-axel22.(none)> +Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <aleksandar@htpc.(none)> +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> Antonio Cunei <antonio.cunei@typesafe.com> +Antonio Cunei <antonio.cunei@typesafe.com> <antonio.cunei@epfl.ch> +Buraq Emir <buraq@epfl.ch> Caoyuan Deng <dcaoyuan@epfl.ch> Chris Hodapp <clhodapp1@gmail.com> Chris James <chrisJames@epfl.ch> Christopher Vogt <vogt@epfl.ch> +Christopher Vogt <vogt@epfl.ch> <christopher.vogt@epfl.ch> +Christopher Vogt <vogt@epfl.ch> <github.com.nsp@cvogt.org> Damien Obristi <damien.obrist@gmail.com> -Daniel C. Sobral <dcs@dcs-132-CK-NF79.(none)> +Daniel C. Sobral <dcsobral@gmail.com> +Daniel C. Sobral <dcsobral@gmail.com> <dcs@dcs-132-CK-NF79.(none)> +Daniel Lorch <lorch@epfl.ch> +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> +Geoff Reedy <geoff@programmer-monk.net> <gereedy@sandia.gov> Ilya Sergei <ilyas@epfl.ch> -Ingo Maier <ingoem@gmail.com> +Ingo Maier <ingo.maier@epfl.ch> +Ingo Maier <ingo.maier@epfl.ch> <ingoem@gmail.com> +Josh Suereth <joshua.suereth@gmail.com> +Josh Suereth <joshua.suereth@gmail.com> <Joshua.Suereth@gmail.com> +Julien Eberle <jeberle@epfl.ch> Kenji Yoshida <6b656e6a69@gmail.com> +Luc Bourlier <luc.bourlier@typesafe.com> +Luc Bourlier <luc.bourlier@typesafe.com> <skyluc@epfl.ch> Luc Bourlier <skyluc@epfl.ch> -Martin Odersky <odersky@gamil.com> +Martin Odersky <odersky@gmail.com> +Martin Odersky <odersky@gmail.com> <odersky@gamil.com> +Michael Pradel <pradel@epfl.ch> +Michel Schinz <schinz@epfl.ch> +Miguel Garcia <magarcia@epfl.ch> +Miguel Garcia <magarcia@epfl.ch> <miguelalfredo.garcia@epfl.ch> +Mirco Dotta <mirco.dotta@typesafe.com> +Mirco Dotta <mirco.dotta@typesafe.com> <mirco.dotta@gmail.com> +Moez A. Abdel-Gawad <moez@epfl.ch> +Mohsen Lesani <lesani@epfl.ch> Nada Amin <amin@epfl.ch> -Nada Amin <nada.amin@epfl.ch> +Nada Amin <amin@epfl.ch> <nada.amin@epfl.ch> +Nada Amin <amin@epfl.ch> <namin@alum.mit.edu> Natallie Baikevich <lu-a-jalla@ya.ru> +Nikolay Mihaylov <mihaylov@epfl.ch> +Paolo Giarrusso <p.giarrusso@gmail.com> Pavel Pavlov <pavel.e.pavlov@gmail.com> Philipp Haller <philipp.haller@typesafe.com> +Philipp Haller <philipp.haller@typesafe.com> <hallerp@gmail.com> +Philippe Altherr <paltherr@epfl.ch> +Raphaël Noir <noir@epfl.ch> Roland Kuhn <rk@rkuhn.info> Rüdiger Klaehn <rklaehn@gmail.com> +Sebastian Hack <shack@epfl.ch> +Simon Ochsenreither <simon@ochsenreither.de> +Stepan Koltsov <stepancheg@epfl.ch> Stéphane Micheloud <michelou@epfl.ch> +Unknown Committer <lost.soul@typesafe.com> +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> +Vojin Jovanovic <vojin.jovanovic@epfl.ch> +Vojin Jovanovic <vojin.jovanovic@epfl.ch> <gvojin@gmail.com> |