X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.mailmap;h=29cc670935e2e7405e4648261997171a8fb32584;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=88ffc727c9cbad4374f9c471857e8bad3fb5710c;hpb=6fcbb243f3c1106eb10e97fa1d8bcf74752748f9;p=lilypond.git

diff --git a/.mailmap b/.mailmap
index 88ffc727c9..29cc670935 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,23 +1,36 @@
 Andrew Hawryluk <ahawryluk@gmail.com>
+Andrew Hawryluk <andrew@obi-wan.(none)>
 Andrew Wilson <andrew@rivendale.net>
 Arjan Bos <arjan.bos@hetnet.nl>
+Benkő Pál <benko.pal@gmail.com>
+Boris Shingarov <b1@shingarov.com>
+Boris Shingarov <shingarov@gmail.com>
 Carl D. Sorensen <carldsorensen>
 Carl D. Sorensen <c_sorensen@byu.edu>
+Carl D. Sorensen <carl.d.sorensen@gmail.com>
+Colin Campbell <colinpkcampbell@gmail.com>
 Chris Snyder <csnyder@adoromusicpub.com>
 Damien Heurtebise <famille.heurtebise@free.fr>
 Daniel Johnson <il.basso.buffo@gmail.com>
 Daniel Tonda Castillo <daniel.tonda@gmail.com>
+David Kastrup <dak@gnu.org>
+Dénes Harmath <harmathdenes@gmail.com>
+Dénes Harmath <thsoft@thsoft-laptop.(none)>
 Dieter Grollmann <groll-ay@bluewin.ch>
 Ed Catmur <ed@capella.catmur.co.uk>
+Erik Sandberg <erik>
 Erlend Aasland <erlenda>
 Erlend Aasland <erlend.aasland@mac.com>
 Erlend Aasland <erlenda@gmail.com>
 Erlend Aasland <erlend@iMac.local>
 Eyolf Østrem <eyolf@oestrem.com>
-Francisco Vila <francisco.vila@hispalinux.es>
+Francisco Vila <francisco.vila@hispalinux.es> # AKA Paco Vila
+Francisco Vila <fravd@salvia.(none)>
+Francisco Vila <fravd@salvia.org>
 Francisco Vila <paconet.org@gmail.com>
-Frederic Bron <frederic.bron@m4x.org>
+Frédéric Bron <frederic.bron@m4x.org>
 Graham Percival <gpercival>
+Graham Percival <gperciva@gperciva-desktop.(none)>
 Graham Percival <gperciva@opihi.cs.uvic.ca>
 Graham Percival <gperciva@p214-046.public.uvic.ca>
 Graham Percival <gperciva@p214-056.public.uvic.ca>
@@ -73,16 +86,29 @@ Graham Percival <gperciva@tsubasa.local>
 Graham Percival <gperciva@tsubasa.(none)>
 Graham Percival <gpermus@gmail.com>
 Graham Percival <graham@percival-music.ca>
+Graham Percival <lilypond@server.kainhofer.com>
+Graham Percival <root@tsubasa.(none)>
+Graham Percival <gperciva@futoi.(none)>
 Hajo Dezelski <dl1sdz@gmail.com>
+Han-Wen Nienhuys and Jan Nieuwenhuizen <fred> # see note below
 Han-Wen Nienhuys <hanwen>
 Han-Wen Nienhuys <hanwen@lilypond.org>
 Han-Wen Nienhuys <hanwen@xs4all.nl>
+Han-Wen Nienhuys <uid67283> #?
 Heikki Junes <hjunes>
 Heikki Junes <hjunes@gmail.com>
 Heikki Junes <hjunes@hjunes-laptop.(none)>
+Heikki Tauriainen <g034737@welho.com>
 Hu Haipeng <hhpmusic@163.com>
 Ian Hulin <ian@hulin.org.uk>
 James E. Bailey <derhindemith@googlemail.com>
+James Lowe <james@james-lilybunto.(none)>
+James Lowe <james@james-lily.(none)>
+James Lowe <james.lowe@datacore.com>
+James Lowe <jlowe@james-ubuntu.(none)>
+Janek Warchoł <janek.lilypond@gmail.com>
+Janek Warchoł <lemniskata.bernoullego@gmail.com>
+Janek Warchoł <lemniskata.bernoulliego@gmail.com>
 Jan Nieuwenhuizen <jan>
 Jan Nieuwenhuizen <janneke>
 Jan Nieuwenhuizen <janneke@gnu.org>
@@ -107,6 +133,10 @@ John Mandereau <lilydev@freemousse.(none)>
 Jonathan Kulp <jon@bashtop.(none)>
 Jonathan Kulp <jonlancekulp@gmail.com>
 Joseph Wakeling <joseph.wakeling@webdrake.net>
+Jürgen Reuter <reuter_j@web.de> <reuter>
+Jürgen Reuter <reuter_j@web.de> <reuter@ipd.uka.de>
+Jürgen Reuter <reuter_j@web.de> <j@web.de>
+Keith OHara <k-ohara5a5a@oco.net>
 Kevin Dalley <kevin@kelphead.org>
 Kieren MacMillan <kieren_macmillan@sympatico.ca>
 Kurt Kroon <kroon@winfirst.com>
@@ -119,12 +149,13 @@ Mats Bengtsson <mabe@violin.s3.kth.se>
 Mats Bengtsson <matsb>
 Matthew Rowles <rowlesmr@gmail.com>
 Matthias Kilian <kili@outback.escape.de>
-Matthieu Jacqot <milarepa7@gmail.com>
 Matthieu Jacquot <milarepa7@gmail.com>
 Maximilian Albert <Anhalter42@gmx.de>
 Maximilian Albert <cilix@daphne.(none)>
 Maximilian Albert <cilix@dike.(none)>
 Maximilian Albert <maximilian.albert@gmail.com>
+Maximiliano García de Veas <maxi@intelacer.(none)>
+Maximiliano García de Veas <mxgdvg@yahoo.it>
 Michael Käppler <xmichael-k@web.de>
 Michael Welsh Duggan <md5i@maru.(none)>
 Milan Zamazal <pdm@brailcom.org>
@@ -132,11 +163,10 @@ Neil Puttock <n.puttock@gmail.com>
 Nicolas Sceaux <nicolas@robert.local>
 Nicolas Sceaux <nicolas.sceaux@free.fr>
 Nicolas Sceaux <nsceaux>
-Paco Vila <francisco.vila@hispalinux.es>
-Paco Vila <fravd@salvia.(none)>
-Paco Vila <fravd@salvia.org>
 Patrick McCarty <pnorcks@gmail.com>
+Patrick Schmidt <p.l.schmidt@gmx.de>
 Paul Jarc <prj@po.cwru.edu>
+Pedro Kroger <kroger>
 Ralph Palmer <palmeer.r.violin@gmail.com>
 Ralph Palmer <palmer.r.violin@gmail.com>
 Ralph Palmer <palmer.r.violin@treda.co.uk>
@@ -148,8 +178,6 @@ Risto Vääräniemi <risvaara@gmail.com>
 Rune Zedeler <rune@zedeler.dk>
 Rune Zedeler <rz>
 Rune Zedeler <rz@daimi.au.dk>
-Sawada Yoshiki <sawada@ubuntu.ubuntu-domain>
-Sawada Yoshiki <sawada.yoshiki@gmail.com>
 Simon Bailey <binabik@gmail.com>
 Simon Bailey <binabik@pc6143-c703.uibk.ac.at>
 Stefan Weil <weil@mail.berlios.de>
@@ -157,9 +185,11 @@ Till Rettig <till.rettig@gmx.de>
 Till Rettig <till@urmeli.(none)>
 Travis Briggs <briggs.travis@gmail.com>
 Trevor Bača <trevorbaca@gmail.com>
+Trevor Daniels <tdanielsmusic@gmail.com>
 Trevor Daniels <t.daniels@treda.co.uk>
 Trevor Daniels <Trevor@Trevor-Laptop>
 Valentin Villenave <valentin@localhost.(none)>
+Valentin Villenave <valentin@villenave.net>
 Valentin Villenave <v.villenave@gmail.com>
 Vegard Nossum <vegard@peltkore.net>
 Werner Lemberg <wl>
@@ -169,16 +199,7 @@ Werner Lemberg <wl@rigel.orion>
 Werner Lemberg <wl@rigel.site>
 Wilbert Berendsen <lilykde@xs4all.nl>
 Wilbert Berendsen <wbsoft@xs4all.nl>
+Yoshiki Sawada <sawada@ubuntu.ubuntu-domain>
+Yoshiki Sawada <sawada.yoshiki@gmail.com>
 
-
-
-Maximiliano <maxi@intelacer.(none)>
-Maximiliano <mxgdvg@yahoo.it>
-Lilypond GDP <lilypond@server.kainhofer.com>
-kroger <kroger>
-reuter <reuter>
-root <root@tsubasa.(none)>
-andrew <andrew@obi-wan.(none)>
-erik <erik>
-fred <fred>
-uid67283 <uid67283>
+# Note on <fred>: http://lists.gnu.org/archive/html/lilypond-devel/2009-02/msg00035.html