The branch, master has been updated
via c02a717c36d620756230d72b8389186c638b2b33 (commit)
from db8ebafaa040cf80b136b9bc457dfad399eb1484 (commit)
- Log -----------------------------------------------------------------
commit c02a717c36d620756230d72b8389186c638b2b33
Author: Kieran Kunhya <kier...@ob-encoder.com>
AuthorDate: Sat Aug 1 23:11:35 2015 +0100
Commit: Kieran Kunhya <kier...@ob-encoder.com>
CommitDate: Sat Aug 1 23:11:35 2015 +0100
Fix stray </p>
diff --git a/src/index b/src/index
index 74529a9..ec6a6f0 100644
--- a/src/index
+++ b/src/index
@@ -45,7 +45,7 @@
The resignation of Michael Niedermayer as leader of FFmpeg yesterday has
come as a shock. He has worked tirelessly on the FFmpeg project for many years
and we must thank him for the work that he has done. We hope that in the future
he will be able to continue to contribute to the project. In the coming weeks,
the FFmpeg project will be managed by the active contributors, until we can
find a more permanent solution.
</p>
<p>
- The last four years have not been easy on our multimedia community, for
both contributors and users. The current situation gives us an opportunity to
find solutions to these issues, and to have reconciliation between the forks,
which have split the community for so long. </p>
+ The last four years have not been easy on our multimedia community, for
both contributors and users. The current situation gives us an opportunity to
find solutions to these issues, and to have reconciliation between the forks,
which have split the community for so long.
</p>
<p>
Unfortunately, much of the disagreement has taken place in inappropriate
venues so far, which has made finding common ground and solutions difficult. We
aim to discuss this in our communities online over the coming weeks, and in
person at the <a
href="https://www.videolan.org/videolan/events/vdd15/";>VideoLAN Developer
Days</a> in Paris in September: a neutral venue for the entire open source
multimedia community.
-----------------------------------------------------------------------
Summary of changes:
src/index | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
