[FFmpeg-cvslog] Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2
Michael Niedermayer
git at videolan.org
Mon Mar 9 12:48:32 CET 2015
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 9 12:38:44 2015 +0100| [e48f2847aba795ac62dcc2aea7c176eb2833c168] | committer: Michael Niedermayer
Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2
* commit 'f74f4a540151aacb38306f2e41a160c326be3d51':
Prepare for 10.6 Release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e48f2847aba795ac62dcc2aea7c176eb2833c168
---
More information about the ffmpeg-cvslog
mailing list