The branch, master has been updated
via edbdf977c8a2bd6e7e6030f32d8536a8babfe9d3 (commit)
from 9bd47b91275d231f829f02d54a812011c13a341b (commit)
- Log -----------------------------------------------------------------
commit edbdf977c8a2bd6e7e6030f32d8536a8babfe9d3
Author: Lou Logan <l...@lrcd.com>
AuthorDate: Tue Dec 2 14:50:59 2014 -0900
Commit: Lou Logan <l...@lrcd.com>
CommitDate: Wed Dec 3 09:18:47 2014 -0900
web/legal: move Legal Threats to bottom of page
This places Legal Threats under all of the more useful stuff.
Signed-off-by: Lou Logan <l...@lrcd.com>
Signed-off-by: Timothy Gu <timothyg...@gmail.com>
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
diff --git a/src/legal b/src/legal
index cb88149..c235d31 100644
--- a/src/legal
+++ b/src/legal
@@ -1,15 +1,3 @@
-<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>
@@ -169,3 +157,14 @@ you start trying to make money from patented technologies,
the owners of
the patents will come after their licensing fees. Notably, MPEG LA is
vigilant and diligent about collecting for MPEG-related technologies.
</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>
-----------------------------------------------------------------------
Summary of changes:
src/legal | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
