[FFmpeg-cvslog] Merge commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a' into release/2.2
Michael Niedermayer
git at videolan.org
Wed Jul 30 20:27:04 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 30 20:12:45 2014 +0200| [6135baa85bda0d8d5ecc3f742858424eb3daf75d] | committer: Michael Niedermayer
Merge commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a' into release/2.2
* commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a':
Prepare for 10.3 Release
Conflicts:
RELEASE
Not merged, as FFmpeg has different version numbers
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6135baa85bda0d8d5ecc3f742858424eb3daf75d
---
More information about the ffmpeg-cvslog
mailing list