X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.mailmap;h=a8ae3180ee8e9461f7c339ce3e30abafa74cf437;hb=f2bd555640f6f28276fd56250c7e8b1bd07aa1df;hp=ca331e073b76aba6175dd95c2c208a34be4cec48;hpb=11d9faab891304da587d957440d8808fc6699e94;p=lilypond.git

diff --git a/.mailmap b/.mailmap
index ca331e073b..a8ae3180ee 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,12 +2,20 @@ 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>
@@ -20,7 +28,7 @@ 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>
@@ -80,6 +88,7 @@ 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>
@@ -92,6 +101,13 @@ Heikki Junes <hjunes@hjunes-laptop.(none)>
 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>
@@ -116,8 +132,9 @@ 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ürgen Reuter <reuter>
 Jürgen Reuter <reuter@ipd.uka.de>
+Keith OHara <k-ohara5a5a@oco.net>
 Kevin Dalley <kevin@kelphead.org>
 Kieren MacMillan <kieren_macmillan@sympatico.ca>
 Kurt Kroon <kroon@winfirst.com>
@@ -145,6 +162,7 @@ Nicolas Sceaux <nicolas@robert.local>
 Nicolas Sceaux <nicolas.sceaux@free.fr>
 Nicolas Sceaux <nsceaux>
 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>
@@ -158,8 +176,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>
@@ -167,9 +183,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>
@@ -179,5 +197,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>
 
 # Note on <fred>: http://lists.gnu.org/archive/html/lilypond-devel/2009-02/msg00035.html