The branch, master has been updated
       via  ea7e07d02d89fddf673022b837d9813277023ae1 (commit)
      from  381914ae78b32d84cf6c78324c17ba238db31afc (commit)


- Log -----------------------------------------------------------------
commit ea7e07d02d89fddf673022b837d9813277023ae1
Author:     Michael Niedermayer <mich...@niedermayer.cc>
AuthorDate: Sun May 22 01:13:24 2016 +0200
Commit:     Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Sun May 22 11:32:53 2016 +0200

    web/contact: correct the condition for op status on IRC
    
    we gave op status to commiters in the CVS and SVN days
    since git an entry in MAINTAINERs was generally required to be offered
    op status and push rights where not required.
    
    Reviewed-by: Lou Logan <l...@lrcd.com>
    Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

diff --git a/src/contact b/src/contact
index 9ee7392..200cb67 100644
--- a/src/contact
+++ b/src/contact
@@ -99,8 +99,8 @@
       <div style="color: white">
         <p>
           FFmpeg has two official channels on the <a 
href="https://freenode.net/";>freenode</a>
-          IRC network. Both channels are open and unmoderated. Developers with 
commit
-          rights have operator status, contributors with patches in FFmpeg
+          IRC network. Both channels are open and unmoderated. Maintainers
+          have operator status, contributors with patches in FFmpeg
           have voice in the channels.
           <a href="https://webchat.freenode.net/";>freenode webchat</a> is a web
           client for these channels.

-----------------------------------------------------------------------

Summary of changes:
 src/contact | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to