ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Mar 16
21:19:29 2015 +0100| [7c9ad3c4ea799be5b3ab315c7241eb5bbb4917ba] | committer:
Michael Niedermayer
Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'
* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
doc: fate: remove outdated SSH key fingerprint
Conflicts:
doc/fate.texi
Not merged, this does not apply to our servers
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c9ad3c4ea799be5b3ab315c7241eb5bbb4917ba
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
