summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-05-29 23:40:16 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-05-29 23:40:16 +0200
commit9d3104881112b12e6cba868f0ee5f5bb932ad265 (patch)
treed6f568630c903a9d281b4c4121b6b0eeb8efe487
parent4e407258b1080947556add7b2ece21422ceafbed (diff)
docs: move sponsor names into authors
We don't need to keep an extra file around, put this into the AUTHORS file under sponsor section. Also credit Team Cymru for providing an extra machine for us for ASN mappings. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rw-r--r--AUTHORS7
-rw-r--r--Sponsors14
2 files changed, 7 insertions, 14 deletions
diff --git a/AUTHORS b/AUTHORS
index 61e9e03..a2f78b1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,13 @@ Minor contributors (<= 30 commits):
* Jon Schipp <jonschipp@gmail.com>
* Sibir Chakraborty <sibir.chakraborty@gmail.com>
+Special thanks to some of our sponsors:
+
+ * Deutsche Flugsicherung GmbH
+ * ETH Zurich, Communications Systems Group
+ * Max Planck Institute for Human Cognitive and Brain Sciences
+ * Team Cymru
+
Notes:
The order of authors with > 30 commits listed here is sorted by contributions
diff --git a/Sponsors b/Sponsors
deleted file mode 100644
index 2d21600..0000000
--- a/Sponsors
+++ /dev/null
@@ -1,14 +0,0 @@
-netsniff-ng is partly sponsored by:
-///////////////////////////////////
-
-Red Hat
- * W: http://www.redhat.com/
-
-Deutsche Flugsicherung GmbH
- * W: https://secais.dfs.de/
-
-ETH Zurich:
- * W: http://csg.ethz.ch/
-
-Max Planck Institute for Human Cognitive and Brain Sciences
- * W: http://www.cbs.mpg.de/