about summary refs log tree commit diff
path: root/third_party/cgit/.mailmap
diff options
context:
space:
mode:
authorVincent Ambo <Vincent Ambo>2020-01-11T23·30+0000
committerVincent Ambo <Vincent Ambo>2020-01-11T23·31+0000
commit5a069d588820da31134d435268bca1cd1532783a (patch)
treedcfee961700d80d0a30848818a2f07934af264a2 /third_party/cgit/.mailmap
parent829de752da8039c7e3dab99db06d4e2112ca6ef4 (diff)
parent723dc8fbcb1a4609c264758eae420ee2811a2b55 (diff)
merge(third_party/cgit): Import at master of 2020-01-11 r/371
Imported commit '723dc8fbcb1a4609c264758eae420ee2811a2b55' as
'third_party/cgit'.
Diffstat (limited to 'third_party/cgit/.mailmap')
-rw-r--r--third_party/cgit/.mailmap10
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/cgit/.mailmap b/third_party/cgit/.mailmap
new file mode 100644
index 000000000000..03b54796cf83
--- /dev/null
+++ b/third_party/cgit/.mailmap
@@ -0,0 +1,10 @@
+Florian Pritz <bluewind@xinu.at> <bluewind@xssn.at>
+Harley Laue <losinggeneration@gmail.com> <losinggeneration@aim.com>
+John Keeping <john@keeping.me.uk> <john@metanate.com>
+Lars Hjemli <hjemli@gmail.com> <larsh@hal-2004.(none)>
+Lars Hjemli <hjemli@gmail.com> <larsh@hatman.(none)>
+Lars Hjemli <hjemli@gmail.com> <larsh@slackbox.hjemli.net>
+Lars Hjemli <hjemli@gmail.com> <larsh@slaptop.hjemli.net>
+Lukas Fleischer <lfleischer@lfos.de> <cgit@cryptocrack.de>
+Lukas Fleischer <lfleischer@lfos.de> <info@cryptocrack.de>
+Stefan Bühler <source@stbuehler.de> <lighttpd@stbuehler.de>