From d33a647b4bdcbf596aaad0589090dcee0fbf0297 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 11 Mar 2015 02:50:45 +0100
Subject: doc: make tools/update-authors.sh cross-platform

And by cross-platform I mean Linux and OS X.  The awk script is not
compatible with BSD awk, that's why this commit changes it to perl.

Update the .mailmap to remove some duplicates and regenerate the
AUTHORS file.

Fixes: https://github.com/iojs/io.js/issues/1120
PR-URL: https://github.com/iojs/io.js/pull/1121
Reviewed-By: Rod Vagg <rod@vagg.org>
---
 .mailmap | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 29c23fa775..9466df3581 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,7 @@ Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Chew Choon Keat <choonkeat@gmail.com>
+Colin Ihrig <cjihrig@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
 Daniel Berger <code+node@dpbis.net>
 Daniel Chcouri <333222@gmail.com>
@@ -76,16 +77,20 @@ Mathias Pettersson <mape@mape.me>
 Michael Bernstein <michaelrbernstein@gmail.com>
 Michael Wilber <gcr@sneakygcr.net>
 Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
+Micleusanu Nicu <micnic90@gmail.com>
 Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
+Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
 Mitar Milutinovic <mitar.git@tnode.com>
 Nebu Pookins<nebu@nebupookins.net>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Nikolai Vavilov <vvnicholas@gmail.com>
 Onne Gorter <onne@onnlucky.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
 Ray Morgan <rmorgan@zappos.com>
 Ray Solomon <raybsolomon@gmail.com>
 Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
 Rick Olson <technoweenie@gmail.com>
+Roman Reiss <me@silverwind.io>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
 Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
@@ -101,6 +106,7 @@ Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
 Simon Willison <simon@simonwillison.net>
 Stanislav Opichal <opichals@gmail.com>
 Stefan Bühler <stbuehler@web.de>
+Steven R. Loomis <srl@icu-project.org>
 TJ Holowaychuk <tj@vision-media.ca>
 TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
 Tadashi SAWADA <cesare@mayverse.jp>
@@ -117,6 +123,9 @@ Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Willi Eggeling <email@wje-online.de>
+Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
+Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
+Yazhong Liu <yorkiefixer@gmail.com> Yorkie <yorkiefixer@gmail.com>
 Yoshihiro KIKUCHI <yknetg@gmail.com>
 Yuichiro MASUI <masui@masuidrive.jp>
 Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
-- 
cgit v1.2.3