ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Sun Dec
21 04:06:01 2014 +0100| [8a9feeff9e31e04bbd43a6279e89cba66a3691de] | committer:
Michael Niedermayer
Merge commit '2cd5640bce0ee8f515ff05040ce1c18d6af2694c' into release/1.1
* commit '2cd5640bce0ee8f515ff05040ce1c18d6af2694c':
Prepare for 9.17 release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a9feeff9e31e04bbd43a6279e89cba66a3691de
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
