aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornikita <nikita@n0.is>2020-04-19 14:07:21 +0200
committernikita <nikita@n0.is>2020-04-19 14:07:21 +0200
commit87481d240d6e44a324ffb5c1a695addd5898ae21 (patch)
tree1a31b376db1322780c2c9e036752c47e83d303eb
parent0c053ecbf57987b2f03f661bc09b9fabf8aae63f (diff)
downloadgnunet-87481d240d6e44a324ffb5c1a695addd5898ae21.tar.gz
gnunet-87481d240d6e44a324ffb5c1a695addd5898ae21.zip
mailmap, authors: final sync of my address and name with changes in NetBSD and GNUnet members.
-rw-r--r--.mailmap17
-rw-r--r--AUTHORS6
2 files changed, 12 insertions, 11 deletions
diff --git a/.mailmap b/.mailmap
index e15a72268..2ca867b4e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,14 +14,15 @@ Jeffrey Burdges <burdges@gnunet.org>
14Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> 14Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
15Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <mschanzenbach@posteo.de> 15Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <mschanzenbach@posteo.de>
16Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Martin Schanzenbach <mschanzenbach@posteo.de> 16Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Martin Schanzenbach <mschanzenbach@posteo.de>
17nikita <tek.no.katze@gmail.com> ng0@n0.is <ng0@n0.is> 17nikita <nikita@n0.is>
18nikita <tek.no.katze@gmail.com> ng0 <ng0@n0.is> 18nikita <nikita@n0.is> nikita <tek.no.katze@gmail.com>
19nikita <tek.no.katze@gmail.com> 19nikita <nikita@n0.is> ng0@n0.is <ng0@n0.is>
20nikita <tek.no.katze@gmail.com> ng0 <contact.ng0@cryptolab.net> 20nikita <nikita@n0.is> ng0 <ng0@n0.is>
21nikita <tek.no.katze@gmail.com> ng0 <ng0@infotropique.org> 21nikita <nikita@n0.is> ng0 <contact.ng0@cryptolab.net>
22nikita <tek.no.katze@gmail.com> N. 'ng0' Gillmann <ngillmann@runbox.com> 22nikita <nikita@n0.is> ng0 <ng0@infotropique.org>
23nikita <tek.no.katze@gmail.com> ng0 <ng0@we.make.ritual.n0.is> 23nikita <nikita@n0.is> N. 'ng0' Gillmann <ngillmann@runbox.com>
24nikita <tek.no.katze@gmail.com> Nils Gillmann <ng0@n0.is> 24nikita <nikita@n0.is> ng0 <ng0@we.make.ritual.n0.is>
25nikita <nikita@n0.is> Nils Gillmann <ng0@n0.is>
25t3sserakt <t3ss@posteo.de> 26t3sserakt <t3ss@posteo.de>
26t3sserakt <t3ss@posteo.de> <t3sserakt@posteo.de> 27t3sserakt <t3ss@posteo.de> <t3sserakt@posteo.de>
27tg(x) <*@tg-x.net> 28tg(x) <*@tg-x.net>
diff --git a/AUTHORS b/AUTHORS
index d44dc3920..061d51379 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,7 +70,7 @@ Marko Räihä
70Michael John Wensley <michael@wensley.org.uk> 70Michael John Wensley <michael@wensley.org.uk>
71Milan Bouchet-Valat <nalimilan@club.fr> 71Milan Bouchet-Valat <nalimilan@club.fr>
72Nathan Evans <evans@net.in.tum.de> 72Nathan Evans <evans@net.in.tum.de>
73Nils Gillmann <ng0@n0.is> [ Documentation export to Texinfo ] 73nikita <nikita@n0.is> [ Documentation export to Texinfo ]
74Paul Ruth <ruth@cs.purdue.edu> 74Paul Ruth <ruth@cs.purdue.edu>
75Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de> 75Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de>
76Renaldo Ferreira <rf@cs.purdue.edu> 76Renaldo Ferreira <rf@cs.purdue.edu>
@@ -124,8 +124,8 @@ Nix: viric, rahul
124OpenWrt/LEDE: Daniel Golle <daniel@makrotopia.org> 124OpenWrt/LEDE: Daniel Golle <daniel@makrotopia.org>
125macOS: Jussi Eloranta <eloranta@cc.jyu.fi> 125macOS: Jussi Eloranta <eloranta@cc.jyu.fi>
126Gentoo: Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX> 126Gentoo: Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>
127 N. Gillmann <ng0@n0.is> 127 nikita <nikita@n0.is>
128NetBSD pkgsrc: N. Gillmann <ng0@n0.is> 128NetBSD pkgsrc: nikita <nikita@NetBSD.org>
129 129
130If you have contributed and are not listed here, please 130If you have contributed and are not listed here, please
131notify one of the maintainers in order to be added. 131notify one of the maintainers in order to be added.