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

diff --git a/.mailmap b/.mailmap
index b5e682cdd0..29cc670935 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,12 +2,18 @@ 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>
@@ -82,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>
@@ -91,10 +98,17 @@ 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>
@@ -119,8 +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ürgen Reuter <reuter@ipd.uka.de>
+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>
@@ -169,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>