ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Tue Dec
2 12:42:38 2014 +0100| [db61d34e83099a22d02500986d9135e4b5bceae8] | committer:
Michael Niedermayer
Merge commit '1cc6fef0671c5522c952671ee06bf973135a22c4' into release/2.4
* commit '1cc6fef0671c5522c952671ee06bf973135a22c4':
Prepare for 11.1 Release
Conflicts:
RELEASE
Not merged, as our release numbers differ
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db61d34e83099a22d02500986d9135e4b5bceae8
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
