diff --git a/.mailmap b/.mailmap index a8c9423d84ec..aef4d969ea0b 100644 --- a/.mailmap +++ b/.mailmap @@ -1,38 +1,73 @@ +Abdelrahman Hussein +A. T. Hofkamp +Amber Yust +Andrew Melo +Aurélien Bompard +Ben Hearsum +Ben Hearsum +Ben Hearsum +Benoît Allard +Benoît Allard +Benoît Allard Brian Warner +Brian Warner Brian Warner Brian Warner -Brian Warner -Dustin J. Mitchell -Dustin J. Mitchell -Dustin J. Mitchell -Marcus Lindblom -Marc-Antoine Ruel -Steve "Ashcrow" Milner -Daniel Dunbar -Ian Zimmerman -Joshua Kugler -Zooko Wilcox-O'Hearn -Randall Bosetti -Randall Bosetti -Stefan Seefeld -Stefan Seefeld -Ben Hearsum -Ben Hearsum +Chad S Metcalf +Charles Lepple +Chris Soyars +Dan Scott Daniel Dunbar +Daniel Dunbar Douglas Hubler +Dustin J. Mitchell +Dustin J. Mitchell +Dustin J. Mitchell Gary Poster Gary Poster +Georges Racinet Geraud Boyer -Kristian Nielsen -Nicolas Sylvain +Greg Ward +Ian Zimmerman +Ian Zimmerman +John Carr +John Ford John O'Duinn -Quentin Raynaud -Rene Müller -Rene Müller -Neil Hemingway -Neil Hemingway +Jon Olsson +Jonathan S. Romero +Joshua Kugler +Justin Wood +Justin Wood +Justin Wood Justin Wood +Kristian Nielsen +Lital Natan +Louis Opter +Louis Opter +Marc-Antoine Ruel +Marc-Antoine Ruel +Marcus Lindblom +Mark Lakewood +Mark Lakewood +Matisse Enzer Michael MacDonald Michael MacDonald -A. T. Hofkamp -Justin Wood -Justin Wood +Nate Bragg +Neil Hemingway +Neil Hemingway +Nicolas Sylvain +Pierre Tardy +Quentin Raynaud +Randall Bosetti +Randall Bosetti +Rene Müller +Rene Müller +Scott Garman +Stefan Seefeld +Stefan Seefeld +Stefan Zager +Steve "Ashcrow" Milner +William Deegan +Zooko Wilcox-O'Hearn +adam +Harry Borkhuis +Andy Howell diff --git a/master/CREDITS b/master/CREDITS index 5ce1c9011ce5..25e22432c62b 100644 --- a/master/CREDITS +++ b/master/CREDITS @@ -42,7 +42,6 @@ Brandon R. Stoner Brett Neely Brian Campbell Brian Warner -Chad Metcalf Chad S Metcalf Charles Davis Charles Hardin @@ -205,7 +204,7 @@ Quentin Raynaud Rafaël Carré Randall Bosetti Renato Alves -Rene Mueller +Rene Müller Rene Rivera Riccardo Magliocchetti Richard Holden @@ -228,9 +227,11 @@ Simon Kennedy Stanislav Kupryakhin Stefan Marr Stefan Seefeld +Stefan Zager Stephen Davis Steve "Ashcrow" Milner Steven Walter +Stuart Auchterlonie Ted Mielczarek Terence Haddock Thijs Triemstra