mozilla: Resolve files with conflicting licensing terms

[vlc] / THANKS

diff --git a/THANKS b/THANKS
index f6f50c60ebd0c85deb925819a22bf4b4dc250960..b02d4f85207d7d8ef4ffab9fd85884f7b8efbd8f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -27,7 +27,8 @@ Andres Krapf <dae at via.ecp.fr> - FreeBSD port and tests, KDE interface
 Andrew Zaikin <andrew dot zaikin at gmail dot com> - Config saving fixes
 Andrey Brilevskiy <director at macwest.ru> - Russian translation
 Andy Lindsay <andy_vl at ananam.com> - fixes in the TS demux
-Anthony Loiseau <anthony.loiseau at gmail dot com> - Fixes in mozilla toolbar
+Anthony Loiseau <anthony.loiseau at gmail dot com> - Various fixes
+Antoine Lejeune - Maemo port
 arai/Fujisawa Tooru <arai_a at mac dot com> - OpenGL-based Screen Input Module for Mac OS X
 Arkadiusz Lipiec <A.Lipiec at elka.pw.edu.pl> - Polish translation
 Arkadiusz Miskiewicz <misiek at pld.ORG.PL> - autoconf and Makefile patches
@@ -69,6 +70,7 @@ Daniel Dreibrodt, aka aLtgLasS <daniel d.t dreibrodt -@t- gmx d0t de> - VLC 0.8.
 Daniel Fischer <dan at subsignal dot org> - Shoutcast output support
 Daniel Stränger <vlc at schmaller d0t de> - M3U, xtag and playlist improvements. Meta information core fixes. XSPF playlist support
 Danko Dolch <info at dolchonline d0t net> - Icons and Design for Qt4 Interface
+Danny Wood <danwood76 -- gmail | com> - Surround PulseAudio support.
 David Flynn - Dirac video codec
 David Kennedy <dkennedy at tinytoad.com> - X11 fullscreen patch
 Daniel Nylander <info @t danielnylander at se> - Swedish translation
@@ -125,7 +127,7 @@ Jasper Alias <j.alias at student.hhs.nl>- Mozilla plugin toolbar
 Javier Varela <tonxabar at hotmail.com> - Spanish translation
 Jean-Alexis Montignies <ja at sente.ch> - coreaudio multiple streams fix
 Jean-Baptiste Le Stang <jp.lestand at lestang.org> - Equalizer-GUI-fixes (OSX), Universal Binary Script
-Jean-Philippe André <jpeg at via.ecp.fr> - Qt bugs and improvements, various bugfixes
+Jean-Philippe André <jpeg at via.ecp.fr> - Qt bugs and improvements, various bugfixes, Zip access module
 Jean-Philippe Grimaldi <jeanphi at via.ecp.fr> - bug fixes
 Dugal Harris <dugalh at protoclea dot. co dot za > - ActiveX bug fixes
 Jean-Pierre Kuypers <Kuypers at sri.ucl.ac.be> - French translation
@@ -135,6 +137,7 @@ Jean-François Massol <jf.massol -<@t> gmail.com> - Qt4 Sout work
 Jérôme Guilbaud - Update of the WinAmp 5 VLC skin
 Joel Arvidsson <dogai at privat.utfors.se> - Swedish translation
 Joeri van Dooren <joeri at van.dooren.be> - OS X icon (v0.4.0)
+Joseph Tulou <brezhoneg1 at yahoo.fr> - small dc1394 patch, image demuxer
 Jörg<vlc-ml at aab.noctis dot de> - VLM seek/show media functions
 Johannes Buchner <buchner.johannes at gmx dot at> - Hotkeys for zoom
 Johen Michael Zorko <zorko at att.net> - fix for delay issues in udp sout
@@ -216,7 +219,7 @@ Pierre Marc Dumuid <pierre.dumuid at adelaide dot edu dot au> - Playlist patches
 Pittayakom Saingtong <develop5 qt datawiz dot co dot th> - Thai localisation
 Przemyslaw Fiala <bl4 a playker dot info> - MMS/TCP fix
 Régis Duchesne <regis at via.ecp.fr> - original VLC code
-Rémi Duraffort <ivoire at via.ecp.fr> - various QT4 patches
+Rémi Duraffort <ivoire at via.ecp.fr> - various QT4 patches, lots of memory leaks and bug fixes
 Remco Poortinga <poortinga at telin.nl> - IPv6 multicast patch
 Rene Gollent <rgollent at u.arizona.edu> - BeOS interface fix
 Richard Hosking <richard at hovis.net> - v4l2 support