[FFmpeg-cvslog] Merge commit 'a014b9614e6165fb8df9e756f46a95d516794678' into release/2.2
Michael Niedermayer
git at videolan.org
Thu Apr 10 04:46:34 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 10 04:35:35 2014 +0200| [bd553941ae518cfcff24efae829ee9af55dcfb15] | committer: Michael Niedermayer
Merge commit 'a014b9614e6165fb8df9e756f46a95d516794678' into release/2.2
* commit 'a014b9614e6165fb8df9e756f46a95d516794678':
Prepare for 10.1 Release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd553941ae518cfcff24efae829ee9af55dcfb15
---
More information about the ffmpeg-cvslog
mailing list