summaryrefslogtreecommitdiff
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
parentb60ddb854ff83d9158be215011314428a898935b (diff)
downloadrockbox-fe4526e8682fe53a9c1eac422f8e9dd8224b8376.tar.gz
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
-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
493Aaron DeMille 493Aaron DeMille
494Tomasz Kowalczyk 494Tomasz Kowalczyk
495Michael Lechner 495Michael Lechner
496Peter Schlenker
497Dan Davison
498David Kauffmann
496 499
497The libmad team 500The libmad team
498The wavpack team 501The 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 @@
1 __________ __ ___.
2 Open \______ \ ____ ____ | | _\_ |__ _______ ___
3 Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
4 Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
5 Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
6 \/ \/ \/ \/ \/
7 Credits Listing
8 - Manual -
9
10People that have contributed to the project's manual, one way or another. Friends!
11
12Peter Schlenker
13José Maria Garcia-Valdecasas Bernal
14Christi Scarborough
15Martin Arver
16Nils Wallménius
17Michael DiFebbo
18Mark Bright
19Dominik Riebeling
20Marianne Arnold
21Thom Johansen
22Jonas Häggqvist
23Dave Chapman
24Dan Everton
25Barry Wardell
26Andrew Melville
27Alexander Levin
28Piotr Jafiszow
29Tom Ross
30Philippe Latulippe
31Costas Calamvokis
32Peter Harley
33Will Robertson
34Robert Menes
35Alex Parker
36Dan Davison
37David Kaufmann