Merge branch 't/sync'

[paraslash.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 13e1dbc6d134c267c4832b675f1f7e9975c452b7..ec4e53627cb54272dc7dcd47ce8551aaf0001951 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,7 @@
 Credits
 =======
 
 Credits
 =======
 

+----

 Several people helped by reporting bugs, improving documentation,
 constructive discussions, or, last but not least, by writing free
 software on which this project is based on.
 Several people helped by reporting bugs, improving documentation,
 constructive discussions, or, last but not least, by writing free
 software on which this project is based on.


@@ -13,6 +14,8 @@ Karl Bartel <karlb@gmx.net> (SFont)
 
 Gerd Becker <gerd.mac@gmx.net> (MacOs testing)
 
 
 Gerd Becker <gerd.mac@gmx.net> (MacOs testing)
 

+Fabrice Bellard (FFmpeg)
+

 Lorenzo Bettini <bettini@dsi.unifi.it> (gengetopt)
 
 Ricardo Cerqueira <rmc@rccn.net> (mp3info)
 Lorenzo Bettini <bettini@dsi.unifi.it> (gengetopt)
 
 Ricardo Cerqueira <rmc@rccn.net> (mp3info)


@@ -23,7 +26,9 @@ Thomas Forell (bug reports)
 
 Silke Klassert (bug reports)
 
 
 Silke Klassert (bug reports)
 

-Steffen Klassert (big iron testing)
+Steffen Klassert (big iron testing, web hosting)
+
+Steven A. Kortze <skortze@sourceforge.net> (mosx-mpg123)

 
 Jaroslav Kysela <perex@suse.cz> (aplay)
 
 
 Jaroslav Kysela <perex@suse.cz> (aplay)
 


@@ -31,15 +36,25 @@ Robert Leslie (libmad)
 
 Ian McDonald <imcdnzl@gmail.com> (dccp example code)
 
 
 Ian McDonald <imcdnzl@gmail.com> (dccp example code)
 

+Loren Merritt (FFmpeg)
+

 Simon Morlat <simon.morlat@linphone.org> (ortp)
 
 Simon Morlat <simon.morlat@linphone.org> (ortp)
 

-Christof Müller (bug reports)
+Christof Müller (bug reports)

 
 M. Hari Nezumi <magenta@trikuare.cx> (AudioCompress)
 
 
 M. Hari Nezumi <magenta@trikuare.cx> (AudioCompress)
 

+Michael Niedermayer <michaelni@gmx.at> (FFmpeg)
+

 Manuel Odendahl <manuel-poc@bl0rg.net> (poc)
 
 Manuel Odendahl <manuel-poc@bl0rg.net> (poc)
 

-Christian Reißmann (design)
+Guillaume Outters <guillaume.outters@free.fr> (mosx-mpg123)
+
+Christian Reißmann (design)
+
+Gerrit Renker <gerrit@erg.abdn.ac.uk> (dccp improvements, IPv6 support)
+
+Luigi Rizzo <luigi@iet.unipi.it> (FEC)

 
 Michael Smith <msmith@xiph.org> (vcut)
 
 
 Michael Smith <msmith@xiph.org> (vcut)
 


@@ -47,3 +62,5 @@ Cedric Tefft <cedric@earthling.net> (mp3info)
 
 Linus Torvalds <torvalds@osdl.org> (for giving us one hell of an
 operating system [quote taken from README.linux for DOOM v1.666])
 
 Linus Torvalds <torvalds@osdl.org> (for giving us one hell of an
 operating system [quote taken from README.linux for DOOM v1.666])

+
+Jean-Marc Valin (speex)