summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-03-25 09:11:47 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:31 +0100
commit3fe5b60fecdc4c6996e3e1293bc413efb6135807 (patch)
tree4e1b487feda50b51976f3b5332afdae446b61ca0 /docs
parent120528e1a2fb30ae5826d3a1c0f6fa5d658dd336 (diff)
downloadvyos-live-build-3fe5b60fecdc4c6996e3e1293bc413efb6135807.tar.gz
vyos-live-build-3fe5b60fecdc4c6996e3e1293bc413efb6135807.zip
Updating credits.
Diffstat (limited to 'docs')
-rw-r--r--docs/AUTHORS7
-rw-r--r--docs/CREDITS17
2 files changed, 22 insertions, 2 deletions
diff --git a/docs/AUTHORS b/docs/AUTHORS
index 908a12e69..b43ea38b1 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -1,3 +1,8 @@
-Main Authors:
+Main Author:
* Daniel Baumann <daniel@debian.org>
+
+Main Contributors:
+
+ * Otavio Salvador <otavio@debian.org>
+ * Chris Lamb <chris@chris-lamb.co.uk>
diff --git a/docs/CREDITS b/docs/CREDITS
index acf3b4f8c..a38aaefd2 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -1,26 +1,41 @@
Patches (alphabetical order):
* Alex Owen <r.a.owen@qmul.ac.uk>
+ * An-Cheng Huang <ancheng@vyatta.com>
+ * Antonio Amorim <Antonio.Amorim@sim.fc.ul.pt>
* Bas Wijnen <wijnen@debian.org>
* Ben Armstrong <synrg@debian.org>
* Cedric Lucantis <omer@no-log.org>
+ * Chris Lamb <chris@chris-lamb.co.uk>
+ * Cyril Brulebois <cyril.brulebois@kerlabs.com>
+ * David Madore <david.madore@ens.fr>
+ * Fathi Boudra <fabo@debian.org>
+ * Franklin Piat <fpiat@bigfoot.com>
* Frederic Lehobey <Frederic.Lehobey@free.fr>
* Guerkan Senguen <gurkan@linuks.mine.nu>
* Hadar Weiss <whadar@gmail.com>
* Inigo Tejedor Arrondo <inigo@navarrux.org>
* Jason D. Clinton <me@jasonclinton.com>
- * Kai Hendry <hendry@iki.fi>
+ * Jean Pierre LeJacq <jp.lejacq@quoininc.com>
+ * Jesse Hathaway <jesse@mbuki-mvuki.org>
+ * Justin Pryzby <pryzbyj@justinpryzby.com>
+ * Kai Hendry <hendry@webconverger.com>
+ * Kel Modderman <kel@otaku42.de>
+ * Maarten ter Huurne <maarten@treewalker.org>
* Marcelo D. Re <mdre@rectorado.unl.edu.ar>
* Marco Amadori <marco.amadori@gmail.com>
* Markus Bauer <bauer-markus@web.de>
* Mathieu Geli <mathieu.geli@gmail.com>
* Otavio Salvador <otavio@debian.org>
+ * Peter Holik <peter@holik.at>
+ * Peter Skogstroem <peter.skogstrom@bitrunner.com>
* Rene Merou <ochominutosdearco@gmail.com>
* Richard Nelson <rjent@rjent.pair.com>
* Scott Edwards <debian@foss.daxal.com>
* Sebastian Raveau <sebastien.raveau@epita.fr>
* Thomas Lange <lange@informatik.uni-koeln.de>
* Trent Buck <trentbuck@gmail.com>
+ * Tzafrir Cohen <tzafrir.cohen@xorcom.com>
* Vladimir Stavrinov <vs@inist.ru>
Donations (alphabetical order):