-
Notifications
You must be signed in to change notification settings - Fork 753
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update mailmap to remove some duplicate entries
There's still plenty more. Feel free to open an issue or a pull request or contact me directly if your name is duplicated or want to appear with a different name in the AUTHORS file (otherwise I usually pick the name that was used in the most recent commit in the git history as the preferred one) Signed-off-by: Haru <[email protected]>
- Loading branch information
1 parent
7f04eac
commit f7f42a0
Showing
2 changed files
with
13 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ | |
| <[email protected]> <[email protected]> | ||
| <[email protected]> <[email protected]> | ||
| <[email protected]> <[email protected]> | ||
| <[email protected]> <[email protected]> | ||
| <[email protected]> <[email protected]> | ||
| <[email protected]> <[email protected]> | ||
| <[email protected]> <[email protected]> | ||
|
|
@@ -29,6 +28,9 @@ Emistry Haoyan <[email protected]> | |
| Evil Puncker <[email protected]> | ||
| Evil Puncker <[email protected]> <[email protected]> | ||
| Evil Puncker <[email protected]> <[email protected]> | ||
| Guilherme G. Menaldo <[email protected]> | ||
| Guilherme G. Menaldo <[email protected]> <[email protected]> | ||
| Guilherme G. Menaldo <[email protected]> <[email protected]> | ||
| Haru <[email protected]> Haruna <[email protected]> | ||
| Jenkijo <[email protected]> <[email protected]> | ||
| KeiKun <[email protected]> Kei <[email protected]> | ||
|
|
@@ -37,21 +39,25 @@ Kenpachi <[email protected]> Kenpachi Developer <Kenpachi.Developer@gmx. | |
| Kenpachi <[email protected]> Kenpachi2k13 <[email protected]> | ||
| Kenpachi <[email protected]> Kenpachi2k13 <[email protected]> | ||
| Kenpachi <[email protected]> kenpachi2k11 <[email protected]> | ||
| Mysteries <[email protected]> | ||
| Smokexyz <[email protected]> | ||
| Smokexyz <[email protected]> <[email protected]> | ||
| Smokexyz <[email protected]> SagunKho <[email protected]> | ||
| Smokexyz <[email protected]> sagunkho <[email protected]> | ||
| Smokexyz <[email protected]> smokexyz <[email protected]> | ||
| Zopokx <[email protected]> | ||
| csnv <[email protected]> | ||
| csnv <[email protected]> <[email protected]> | ||
| euphyy <[email protected]> | ||
| hwsapibot <[email protected]> <[email protected]> | ||
| hwsapibot <[email protected]> Hercules.ws <[email protected]> | ||
| kisuka <[email protected]> | ||
| skyleo <[email protected]> <[email protected]> | ||
| skyleo <[email protected]> Leo Pflug <[email protected]> | ||
|
|
||
| # SVN -> git mailmap | ||
|
|
||
| <[email protected]> <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| kisuka <[email protected]> <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| Lemongrass3110 <[email protected]> <lemongrass3110@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <trojal@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
|
|
@@ -62,8 +68,8 @@ Kenpachi <[email protected]> <kenpachi2k11@54d463be-8e91-2dee-dedb-b6813 | |
| <[email protected]> <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| gepard1984 <[email protected]> <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| gepard1984 <[email protected]> <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
|
|
@@ -75,9 +81,9 @@ Paradox924X <[email protected]> <Paradox924x@54d463be-8e91-2dee-dedb-b68131a | |
| Paradox924X <[email protected]> <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <Yommy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <flaviojs2005@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| flaviojs <[email protected]> <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| flaviojs <[email protected]> <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| flaviojs <[email protected]> <flaviojs2005@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
| <[email protected]> <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,10 +36,7 @@ euphyy <[email protected]> | |
| Evil Puncker <[email protected]> | ||
| EyesOfAHawk <[email protected]> | ||
| Fisune <[email protected]> | ||
| flaviojs2005 <[email protected]> | ||
| flaviojs <[email protected]> | ||
| FlavioJS <[email protected]> | ||
| Flipp <[email protected]> | ||
| Florian Wilkemeyer <[email protected]> | ||
| FreddieFatso <[email protected]> | ||
| Frost <[email protected]> | ||
|
|
@@ -48,16 +45,12 @@ GammCrucis <[email protected]> | |
| Gde Mahardhikha Satrigraha <[email protected]> | ||
| Geniks <[email protected]> | ||
| gepard1984 <[email protected]> | ||
| Gepard <[email protected]> | ||
| glighta <[email protected]> | ||
| GmOcean <[email protected]> | ||
| greenboxal2 <[email protected]> | ||
| GrumpyLittlePanda <[email protected]> | ||
| Guilherme G. Menaldo <[email protected]> | ||
| Guilherme G. M <[email protected]> | ||
| Guilherme Guiguer Menaldo <[email protected]> | ||
| Guilherme <[email protected]> | ||
| Guilherme Menaldo <[email protected]> | ||
| gumi <[email protected]> | ||
| Habilya <[email protected]> | ||
| Habilya <hercuser@prdcrazyserver> | ||
|
|
@@ -85,16 +78,12 @@ Jesusaves <[email protected]> | |
| jmanfffreak <[email protected]> | ||
| joel <[email protected]> | ||
| Jônatas Andreta <[email protected]> | ||
| Jorge C <[email protected]> | ||
| Jose Luis Rivera Flores <[email protected]> | ||
| j-tkay <[email protected]> | ||
| KeiKun <[email protected]> | ||
| Kenpachi <[email protected]> | ||
| Kerubael <[email protected]> | ||
| KirieZ <[email protected]> | ||
| KirieZ <[email protected]> | ||
| kisuka <[email protected]> | ||
| Kisuka <[email protected]> | ||
| Kolkka <[email protected]> | ||
| Kpy! <[email protected]> | ||
| lagonnebula <[email protected]> | ||
|
|
@@ -142,9 +131,6 @@ Murilo_Bio <[email protected]> | |
| Murilo Pereti Tavares <[email protected]> | ||
| muujiza <[email protected]> | ||
| Mysteries <[email protected]> | ||
| Mysterious <[email protected]> | ||
| nadiyama <[email protected]> | ||
| nadiyama <[email protected]> | ||
| Nihadm89 <[email protected]> | ||
| Noil <[email protected]> | ||
| Normynator <[email protected]> | ||
|
|
@@ -184,7 +170,6 @@ Smokexyz <[email protected]> | |
| Streusel <[email protected]> | ||
| Susu <[email protected]> | ||
| Susu <[email protected]> | ||
| Taylor Locke <[email protected]> | ||
| TeMPlatonic <[email protected]> | ||
| themon <[email protected]> | ||
| Thibault Payet <[email protected]> | ||
|
|
||