[FFmpeg-cvslog] [ffmpeg-web] branch master updated. ef5bf26 web/contact: mention ffserver-user/ffmpeg-user merge

[gitolite]

The branch, master has been updated
       via  ef5bf26c7df399376941216ad8251253a22ae132 (commit)
      from  5aa0aab2dc5ace2a20a9cc3822033a97b08cdd01 (commit)


- Log -----------------------------------------------------------------
commit ef5bf26c7df399376941216ad8251253a22ae132
Author:     Lou Logan <lou at lrcd.com>
AuthorDate: Mon Feb 4 10:57:02 2013 -0900
Commit:     Lou Logan <lou at lrcd.com>
CommitDate: Mon Feb 4 11:02:37 2013 -0900

    web/contact: mention ffserver-user/ffmpeg-user merge

diff --git a/src/contact b/src/contact
index 9e74fa8..34ce0b4 100644
--- a/src/contact
+++ b/src/contact
@@ -27,12 +27,9 @@ Trespass these rules at the risk of being flamed.
 
 <p>
 <a href="https://lists.ffmpeg.org/mailman/listinfo/ffmpeg-user/">ffmpeg-user</a>:
-This list is for regular user questions like compilation troubles,
-command-line issues and similar.
-<br />
-<a href="https://lists.ffmpeg.org/mailman/listinfo/ffserver-user/">ffserver-user</a>:
-This list is for ffserver user questions like configuration and streaming
-issues.
+This list is for regular user questions and discussions including usage of
+<code>ffmpeg</code>, <code>ffplay</code>, <code>ffprobe</code>, and
+<code>ffserver</code>.
 <br />
 <a href="https://lists.ffmpeg.org/mailman/listinfo/libav-user/">libav-user</a>:
 This list is for application developer questions about development using the
@@ -47,7 +44,7 @@ for bug reports.
 This list gets all changes to the FFmpeg sources / main git repository.
 <br />
 <a href="https://lists.ffmpeg.org/mailman/listinfo/ffmpeg-trac/">ffmpeg-trac</a>:
-This list gets all changes to the FFmpeg Trac issuetracker.
+This list gets all changes to the FFmpeg Trac issue tracker.
 </p>
 
 <p>
@@ -67,8 +64,6 @@ browse the archives before posting questions.
 <p>
 <a href="https://lists.ffmpeg.org/pipermail/ffmpeg-user/">ffmpeg-user archives</a>
 <br />
-<a href="https://lists.ffmpeg.org/pipermail/ffserver-user/">ffserver-user archives</a>
-<br />
 <a href="https://lists.ffmpeg.org/pipermail/libav-user/">libav-user archives</a>
 <br />
 <a href="https://lists.ffmpeg.org/pipermail/ffmpeg-devel/">ffmpeg-devel archives</a>
@@ -76,6 +71,9 @@ browse the archives before posting questions.
 <a href="https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/">ffmpeg-cvslog archives</a>
 <br />
 <a href="https://lists.ffmpeg.org/pipermail/ffmpeg-soc/">ffmpeg-soc archives</a>
+<br />
+<a href="https://lists.ffmpeg.org/pipermail/ffserver-user/">ffserver-user archives</a>
+(ffserver-user merged with ffmpeg-user on 2013-02-04)
 </p>
 
 

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

Summary of changes:
 src/contact |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)


hooks/post-receive
--