Skip to content

Commit

Permalink
Updating .mailmap and AUTHORS before release
Browse files Browse the repository at this point in the history
  • Loading branch information
twitwi committed Aug 3, 2017
1 parent 57f4563 commit 48dc8d7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 27 deletions.
15 changes: 10 additions & 5 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,51 +1,56 @@
Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com>
Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com> <abigail.cabunoc@oicr.on.ca>
Alois Heilmaier <a.heilmaier@hotmail.com>
Andrew Lonsdale <andrew.lonsdale@lonsbio.com.au>
Andrew Rohl <a.rohl@curtin.edu.au>
Andy Boughton <abought@gmail.com> <pchemist@gmail.com>
Ariel Rokem <arokem@gmail.com>
Arnstein Orten <arnstein.orten@gmail.com>
Bennet Fauber <justbennet@users.noreply.github.com>
Bérénice Batut <berenice.batut@gmail.com>
Bérénice Batut <berenice.batut@gmail.com> <berenice.batut@udamail.fr>
Bernhard Konrad <bernhard.konrad@gmail.com>
Bill Mills <mills.wj@gmail.com>
Brenna O'Brien <info@brennaobrien.com>
Chris Pawsey <chris.bording@pawsey.org.au>
Christoph Junghans <christoph.junghans@gmail.com> <junghans@votca.org>
Daisie Huang <daisieh@gmail.com>
Danielle Traphagen <dtrapezoid@gmail.com>
Dorota Jarecka <djarecka@gmail.com>
Emily Dolson <emilyldolson@gmail.com>
Emmanouil Farsarakis <farsarakis@gmail.com> <farsarakis@epcc.ed.ac.uk>
Erin Becker <erinstellabecker@gmail.com>
Evan P. Williamson <evanpeterw@gmail.com>
François Michonneau <francois.michonneau@gmail.com>
François Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
Greg Watson <g.watson@computer.org>
Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
Ivan Gonzalez <iglpdc@gmail.com> <iglpdc@users.noreply.github.com>
James Allen <james@sharelatex.com> <jamesallen0108@gmail.com>
Jane Charlesworth <janepipistrelle@gmail.com>
Kate Hertweck <k8hertweck@gmail.com>
Kate Lee <kl167@le.ac.uk>
Luke W. Johnston <lwjohnst@gmail.com>
Marisa Guarinello <mguarinello@gmail.com>
Mark Wheelhouse <mjw03@doc.ic.ac.uk>
Mary C. Kinniburgh <mckinniburgh@gmail.com>
Mateusz Kuzak <mateusz.kuzak@gmail.com>
Matthias Haeni <datamat@users.noreply.github.com>
Maxim Belkin <maxim.belkin@gmail.com> <maxim-belkin@users.noreply.github.com>
Michael Panitz <michpa@hotmail.com>
Mike Jackson <m.jackson@software.ac.uk> <michaelj@epcc.ed.ac.uk>
Natalie Robinson <n.robinson@colorado.edu>
Nicholas Hannah <nchlshnnh@gmail.com> <nicholash@users.noreply.github.com>
Nicola Soranzo <nicola.soranzo@tgac.ac.uk> <nsoranzo@tiscali.it>
Nicola Soranzo <nicola.soranzo@earlham.ac.uk> <nsoranzo@tiscali.it>
Patrick C. Shriwise <shriwise@wisc.edu>
Pauline Barmby <pbarmby@uwo.ca>
Peter Steinbach <steinbac@mpi-cbg.de> <steinbach@scionics.de>
Raniere Silva <raniere@rgaiacs.com> <ra092767@ime.unicamp.br>
Raniere Silva <raniere@rgaiacs.com> <raniere@ime.unicamp.br>
Rémi Emonet <remi@heeere.com> <remi.emonet@reverse--com.heeere>
Rémi Emonet <remi@heeere.com> <twitwi@users.noreply.github.com>
Sarah Stevens <ssteven2@wisc.edu> <sstevens2@wisc.edu>
Sean Aubin <saubin@uwaterloo.ca>
Steve Vandervalk <steven.vandervalk@jcu.edu.au> <stevenvandervalk@users.noreply.github.com>
Tiffany Timbers <tiffany.timbers@gmail.com>
Timothée Poisot <t.poisot@gmail.com> <tim@poisotlab.io>
Tom Kelly <tomkellygenetics@gmail.com>
Vijay P. Nagraj <vpnagraj@virginia.edu>
Yuandra Ismiraldi <me@yuandraismiraldi.net>
zz-abracarambar <abracarambar@users.noreply.github.com>
40 changes: 18 additions & 22 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
Aron Ahmadia
James Allen
Alison Appling
Sean Aubin
Pete Bachant
Daniel Baird
Piotr Banaszkiewicz
Pauline Barmby
Bérénice Batut
Trevor Bekolay
Maxim Belkin
John Blischak
Madeleine Bonsma
Jon Borrelli
Andy Boughton
Daina Bouquin
Rudi Brauning
Matthew Brett
Amy Brown
Abigail Cabunoc Mayes
Jane Charlesworth
Billy Charlton
Daniel Chen
Garret Christensen
Ruth Collings
Marianne Corvellec
Matt Davis
Gabriel A. Devenyi
Emily Dolson
Laurent Duchesne
Jonah Duckles
Expand All @@ -34,7 +27,6 @@ Loïc Estève
Emmanouil Farsarakis
Bennet Fauber
Anne Fouilloux
Konrad Förstner
Stuart Geiger
Ivan Gonzalez
Marisa Guarinello
Expand All @@ -43,16 +35,12 @@ Jamie Hadwin
Matthias Haeni
Pierre Haessig
Nicholas Hannah
Michael Hansen
Sumana Harihareswara
Alois Heilmaier
Martin Heroux
Kate Hertweck
Andreas Hilboll
Konrad Hinsen
Daisie Huang
Yuandra Ismiraldi
Mike Jackson
Christian Jacobs
Dorota Jarecka
Luke W. Johnston
Expand All @@ -66,7 +54,6 @@ Mateusz Kuzak
Arne Küderle
Kathleen Labrie
Hilmar Lapp
Doug Latornell
Mark Laufersweiler
David LeBauer
Kate Lee
Expand All @@ -76,26 +63,18 @@ Catrina Loucks
Keith Ma
Kunal Marwaha
Ryan May
François Michonneau
Bill Mills
Andreas Mueller
Madicken Munk
VP Nagraj
Lex Nederbragt
Juan Nunez-Iglesias
Brenna O'Brien
Aaron O'Leary
Catherine Olsson
Michael Panitz
Chris Pawsey
Stefan Pfenninger
Jon Pipitone
Timothée Poisot
Paul Preney
Timothy Rice
Kristina Riemer
David Rio Deiros
Natalie Robinson
Annika Rockenberger
Andrew Rohl
Ariel Rokem
Expand All @@ -121,7 +100,24 @@ Greg Watson
Belinda Weaver
Mark Wheelhouse
Ethan White
Evan P. Williamson
Greg Wilson
Steven Wu
Qingpeng Zhang
Andrew Lonsdale
Arnstein Orten
Ben Bolker
Christoph Junghans
David Jennings
James Tocknell
Jonathan Cooper
Katrin Leinweber
Leo Browning
Mary C. Kinniburgh
Matthew Bourque
Matthew Hartley
Raphaël Grolimund
Scott Bailey
Todd Gamblin
Tommy Keswick
Vijay P. Nagraj
Will Usher

0 comments on commit 48dc8d7

Please sign in to comment.