diff options
| author | xrs <xrs@mail36.net> | 2017-10-25 22:36:10 +0200 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2017-10-25 22:36:10 +0200 |
| commit | 92b6a83e9ba576ba237d47d780f3b9b10bb26588 (patch) | |
| tree | bca8f723ca2de2ed76bd3bbe416bf9472a7b96cb /AUTHORS | |
| parent | 9356f42f546d61ccfb6a3ec46605c9b83fdc8546 (diff) | |
| parent | 17e755c71521be9a84f0f3b46d1de6962298f733 (diff) | |
| download | gnunet-92b6a83e9ba576ba237d47d780f3b9b10bb26588.tar.gz gnunet-92b6a83e9ba576ba237d47d780f3b9b10bb26588.zip | |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -32,7 +32,6 @@ Werner Koch <wk@gnupg.org> | |||
| 32 | Contributions also came from: | 32 | Contributions also came from: |
| 33 | Adam Warrington [ UPnP ] | 33 | Adam Warrington [ UPnP ] |
| 34 | Adriano Peluso [ Documentation export to Texinfo ] | 34 | Adriano Peluso [ Documentation export to Texinfo ] |
| 35 | ng0 <ng0@infotropique.org> [ Documentation export to Texinfo ] | ||
| 36 | Alex Harper [ OS X CPU load ] | 35 | Alex Harper [ OS X CPU load ] |
| 37 | Andrew McDonald <andrew@mcdonald.org.uk> [ SHA-512] | 36 | Andrew McDonald <andrew@mcdonald.org.uk> [ SHA-512] |
| 38 | Andy Green <andy@warmcat.com> | 37 | Andy Green <andy@warmcat.com> |
| @@ -69,6 +68,7 @@ Marko Räihä | |||
| 69 | Michael John Wensley <michael@wensley.org.uk> | 68 | Michael John Wensley <michael@wensley.org.uk> |
| 70 | Milan Bouchet-Valat <nalimilan@club.fr> | 69 | Milan Bouchet-Valat <nalimilan@club.fr> |
| 71 | Nathan Evans <evans@net.in.tum.de> | 70 | Nathan Evans <evans@net.in.tum.de> |
| 71 | ng0 <ng0@infotropique.org> [ Documentation export to Texinfo ] | ||
| 72 | Paul Ruth <ruth@cs.purdue.edu> | 72 | Paul Ruth <ruth@cs.purdue.edu> |
| 73 | Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de> | 73 | Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de> |
| 74 | Renaldo Ferreira <rf@cs.purdue.edu> | 74 | Renaldo Ferreira <rf@cs.purdue.edu> |