summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@banu.com>2012-01-23 16:31:24 +0530
committerMukund Sivaraman <muks@banu.com>2012-01-23 16:32:35 +0530
commit983d241db6b368106bfc7db1844105bb94ed54ad (patch)
tree8ce17526f623baf9b9d3f061e66fd342934c672d
parent2e4ea496b3a38e73069f0527da31c41064f703a1 (diff)
downloadtinyproxy-983d241db6b368106bfc7db1844105bb94ed54ad.tar.gz
tinyproxy-983d241db6b368106bfc7db1844105bb94ed54ad.zip
Update authors
-rw-r--r--AUTHORS2
-rw-r--r--authors.xml2
-rw-r--r--src/authors.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 145ff21..9c82e40 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ The following people have contributed code to Tinyproxy:
* Andrew Stribblehill
* Chris Lightfoot
+ * Daniel Egger
* David Shanks
* Dmitry Semyonov
* George Talusan
@@ -23,6 +24,7 @@ The following people have contributed code to Tinyproxy:
* Mathew Mrosko
* Matthew Dempsky
* Michael Adam
+ * Moritz Muehlenhoff
* Mukund Sivaraman
* Petr Lampa
* Robert James Kaes
diff --git a/authors.xml b/authors.xml
index ef9eda6..7fc94f2 100644
--- a/authors.xml
+++ b/authors.xml
@@ -14,6 +14,7 @@
<contributor role="author" last-active="1.7">Andrew Stribblehill</contributor>
<contributor role="author" last-active="1.6">Chris Lightfoot</contributor>
+ <contributor role="author" last-active="1.8">Daniel Egger</contributor>
<contributor role="author" last-active="1.8">David Shanks</contributor>
<contributor role="author" last-active="1.8">Dmitry Semyonov</contributor>
<contributor role="author" last-active="1.6">George Talusan</contributor>
@@ -26,6 +27,7 @@
<contributor role="author" last-active="1.8">Mathew Mrosko</contributor>
<contributor role="author" last-active="1.7">Matthew Dempsky</contributor>
<contributor role="author,documenter" last-active="1.8">Michael Adam</contributor>
+ <contributor role="author" last-active="1.8">Moritz Muehlenhoff</contributor>
<contributor role="author,documenter" last-active="1.8">Mukund Sivaraman</contributor>
<contributor role="author" last-active="1.6">Petr Lampa</contributor>
<contributor role="author,documenter" last-active="1.7">Robert James Kaes</contributor>
diff --git a/src/authors.c b/src/authors.c
index a76367e..496df93 100644
--- a/src/authors.c
+++ b/src/authors.c
@@ -7,6 +7,7 @@ static const char * const authors[] =
{
"Andrew Stribblehill",
"Chris Lightfoot",
+ "Daniel Egger",
"David Shanks",
"Dmitry Semyonov",
"George Talusan",
@@ -18,6 +19,7 @@ static const char * const authors[] =
"Mathew Mrosko",
"Matthew Dempsky",
"Michael Adam",
+ "Moritz Muehlenhoff",
"Mukund Sivaraman",
"Petr Lampa",
"Robert James Kaes",