summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Parker <rockbox@aeparker.com>2009-09-23 16:47:43 +0000
committerAlex Parker <rockbox@aeparker.com>2009-09-23 16:47:43 +0000
commitfe4526e8682fe53a9c1eac422f8e9dd8224b8376 (patch)
tree4216261f6b15a8be0af9adf8141e06d6854a2ee3 /docs
parentb60ddb854ff83d9158be215011314428a898935b (diff)
downloadrockbox-fe4526e8682fe53a9c1eac422f8e9dd8224b8376.tar.gz
rockbox-fe4526e8682fe53a9c1eac422f8e9dd8224b8376.tar.bz2
rockbox-fe4526e8682fe53a9c1eac422f8e9dd8224b8376.zip
Recognise everybody in the same CREDITS file: add the three people only in CREDITS-MANUAL to CREDITS and remove CREDITS-MANUAL.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22798 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'docs')
-rw-r--r--docs/CREDITS3
-rw-r--r--docs/CREDITS-MANUAL37
2 files changed, 3 insertions, 37 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 9066778249..7639b30e03 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -493,6 +493,9 @@ Jason Yu
Aaron DeMille
Tomasz Kowalczyk
Michael Lechner
+Peter Schlenker
+Dan Davison
+David Kauffmann
The libmad team
The wavpack team
diff --git a/docs/CREDITS-MANUAL b/docs/CREDITS-MANUAL
deleted file mode 100644
index 5ecbde46b6..0000000000
--- a/docs/CREDITS-MANUAL
+++ /dev/null
@@ -1,37 +0,0 @@
- __________ __ ___.
- Open \______ \ ____ ____ | | _\_ |__ _______ ___
- Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- \/ \/ \/ \/ \/
- Credits Listing
- - Manual -
-
-People that have contributed to the project's manual, one way or another. Friends!
-
-Peter Schlenker
-José Maria Garcia-Valdecasas Bernal
-Christi Scarborough
-Martin Arver
-Nils Wallménius
-Michael DiFebbo
-Mark Bright
-Dominik Riebeling
-Marianne Arnold
-Thom Johansen
-Jonas Häggqvist
-Dave Chapman
-Dan Everton
-Barry Wardell
-Andrew Melville
-Alexander Levin
-Piotr Jafiszow
-Tom Ross
-Philippe Latulippe
-Costas Calamvokis
-Peter Harley
-Will Robertson
-Robert Menes
-Alex Parker
-Dan Davison
-David Kaufmann