From c8b3b13615d4b3874c792549a8467e88575138b9 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Mon, 8 Aug 2011 16:06:31 -0500 Subject: [PATCH] Added .mailmap file for AUTHORS. --- .mailmap | 10 ++++++++++ AUTHORS | 11 +++-------- tools/generate_authors.sh | 0 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .mailmap mode change 100644 => 100755 tools/generate_authors.sh diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..53f67d13a --- /dev/null +++ b/.mailmap @@ -0,0 +1,10 @@ +Antony Messerli root + +Chris Behrens comstud + +Johannes Erdfelt jerdfelt + + + + +Andy Smith termie diff --git a/AUTHORS b/AUTHORS index 9e2b71218..056b526ff 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,22 +1,17 @@ Andrey Brindeyev +Andy Smith Antony Messerli Brian Lamar Brian Waldon -Chris Behrens +Chris Behrens Christopher MacGown Ed Leafe Eldar Nugaev Ilya Alekseyev Johannes Erdfelt -Josh Kearney Josh Kearney Kevin L. Mitchell Kirill Shileev Lvov Maxim Matt Dietz -Sandy Walsh -Sandy Walsh -comstud -jerdfelt -root -termie +Sandy Walsh diff --git a/tools/generate_authors.sh b/tools/generate_authors.sh old mode 100644 new mode 100755