X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=MAINTAINERS;h=b2e47a410b9bf92b1d904753187eb984f785c49c;hb=757b9f5c874ec00568be7994dab88030f99c60d9;hp=a06535f2cf6e3560a74a2644a536c51abd8aa72e;hpb=caf200f5e94783c777e0a859e92bddc6608a01c0;p=vlc

diff --git a/MAINTAINERS b/MAINTAINERS
index a06535f2cf..b2e47a410b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-# $Id: MAINTAINERS,v 1.5 2002/12/08 16:16:19 jpsaman Exp $
+# $Id$
 #
 #                            VLC MAINTAINERS
 #
@@ -25,12 +25,13 @@
   - Mandrake Linux : Yves Duret
   - BeOS : Eric Petit (Stephan Assmus)
   - Windows : [gibalou]
-  - Mac OS X : [jlj] ([meuuh])
+  - Mac OS X : [thedj])
   - QNX RTOS : [jlj]
   - Solaris : [meuuh]
   - *BSD : [meuuh]
   - GNU/Hurd : [sam]
-  - iPAQ Familiar Linux : [saman] ([meuuh])
+  - iPAQ Familiar Linux : [saman] & [marcari] ([meuuh])
+  - YOPY/Linupy : [marcari]
   - BSD/OS : Steven M. Schultz
 
 * INTERFACE
@@ -96,9 +97,10 @@
 [henri] = Henri Fallon
 [jlj] = Jon Lech Johansen
 [jobi] = Johan Bilien
-[lool] = Loïc Minier
+[lool] = Loïc Minier
 [meuuh] = Christophe Massiot
 [sam] = Samuel Hocevar
 [saman] = Jean-Paul Saman
 [sigmund] = Sigmund Augdal
-[stef] = Stéphane Borel
+[stef] = Stéphane Borel
+[thedj] = Derk-Jan Hartman