[FFmpeg-cvslog] Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1
Michael Niedermayer
git at videolan.org
Sun Dec 21 04:15:43 CET 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 21 04:06:49 2014 +0100| [c7b8f02940ecb911fde566a578f3aae2eddf302f] | committer: Michael Niedermayer
Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1
* commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248':
Update Changelog for v9.17
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7b8f02940ecb911fde566a578f3aae2eddf302f
---
More information about the ffmpeg-cvslog
mailing list