[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 6a1231b web: move legal-threats we received to the legal page

[gitolite]

The branch, master has been updated
       via  6a1231b215ea5eee78e77302699de4a3ab0f2682 (commit)
      from  82d8255a46a4d1a3fe79ab9b85ed16aebd106175 (commit)


- Log -----------------------------------------------------------------
commit 6a1231b215ea5eee78e77302699de4a3ab0f2682
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Sun Nov 6 00:41:37 2011 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Sun Nov 6 22:45:57 2011 +0100

    web: move legal-threats we received to the legal page

diff --git a/src/index b/src/index
index 5445407..d64e4a5 100644
--- a/src/index
+++ b/src/index
@@ -31,18 +31,6 @@ with the latest developments by subscribing to both the
 </p>
 
 
-<h1>Legal threats</h1>
-
-<a id="legal_threat"></a><h3>May 30, 2011</h3>
-<p>
-Today FFmpeg has received the <a href="threat1.png">first legal threat</a> in its existence. Its
-from a previous root admin of FFmpeg, who now is root admin of the
-Libav fork of FFmpeg. He claims copyright on the zigzag part of our
-logo. It has to be noted that he said 4 years ago <a href="http://article.gmane.org/gmane.comp.video.ffmpeg.devel/44742"><cite>Credit to whoever came up with the zigzag idea</cite></a></p>
-<p><i>Update May 31/June 1:</i>We have replaced the logo with a better looking one drawn by
-Hervé Flores.</p>
-
-
 <h1>News</h1>
 
 <a id="pr7dot7and8dot6"></a><h3>November 4, 2011</h3>
diff --git a/src/legal b/src/legal
index 1037a69..bebf7f0 100644
--- a/src/legal
+++ b/src/legal
@@ -1,3 +1,15 @@
+<h1>Legal threats</h1>
+
+<a id="legal_threat"></a><h3>May 30, 2011</h3>
+<p>
+Today FFmpeg has received the <a href="threat1.png">first legal threat</a> in its existence. Its
+from a previous root admin of FFmpeg, who now is root admin of the
+Libav fork of FFmpeg. He claims copyright on the zigzag part of our
+logo. It has to be noted that he said 4 years ago <a href="http://article.gmane.org/gmane.comp.video.ffmpeg.devel/44742"><cite>Credit to whoever came up with the zigzag idea</cite></a></p>
+<p><i>Update May 31/June 1:</i>We have replaced the logo with a better looking one drawn by
+Hervé Flores.</p>
+
+
 <h1>FFmpeg License and Legal Considerations</h1>
 
 <p>

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

Summary of changes:
 src/index |   12 ------------
 src/legal |   12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
--