ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e48f2847aba795ac62dcc2aea7c176eb2833c168
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
