Skip to content

Commit

Permalink
Rollup merge of #67664 - Manishearth:mailmapfixes, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix some mailmap entries

r? @pietroalbini
  • Loading branch information
oli-obk authored Dec 27, 2019
2 parents 335c887 + e518e38 commit 65bbcf0
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ Lindsey Kuper <[email protected]> <[email protected]>
Luke Metz <[email protected]>
Luqman Aden <[email protected]> <[email protected]>
Luqman Aden <[email protected]> <[email protected]>
Manish Goregaokar <[email protected]>
Marcell Pardavi <[email protected]>
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
Mark Rousskov <[email protected]>
Expand Down Expand Up @@ -186,6 +187,7 @@ Neil Pankey <[email protected]> <[email protected]>
Nick Platt <[email protected]>
Nicole Mazzuca <[email protected]>
Nif Ward <[email protected]>
Nika Layzell <[email protected]>
Oliver Middleton <[email protected]> <[email protected]>
Oliver Scherer <[email protected]> <[email protected]>
Oliver Scherer <[email protected]> <[email protected]>
Expand All @@ -205,7 +207,6 @@ Paul Faria <[email protected]> Paul Faria <[email protected]>
Peer Aramillo Irizar <[email protected]> parir <[email protected]>
Peter Elmers <[email protected]> <[email protected]>
Peter Liniker <[email protected]>
Peter Zotov <[email protected]>
Phil Dawes <[email protected]> Phil Dawes <[email protected]>
Philipp Brüschweiler <[email protected]> <[email protected]>
Philipp Brüschweiler <[email protected]> <[email protected]>
Expand Down Expand Up @@ -256,6 +257,7 @@ Ulrik Sverdrup <[email protected]> Ulrik Sverdrup <root@localhost>
Vadim Petrochenkov <[email protected]>
Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
Vitali Haravy <[email protected]> Vitali Haravy <[email protected]>
whitequark <[email protected]>
William Ting <[email protected]> <[email protected]>
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
Expand Down

0 comments on commit 65bbcf0

Please sign in to comment.