[FFmpeg-cvslog] Merge commit '26bbc1c242ebfeec3c49585207efac7293632433' into release/2.2
Michael Niedermayer
git at videolan.org
Sun Mar 23 19:56:57 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 19:54:52 2014 +0100| [9abe0bfb7f52d450c9c4b392d8c4b88007562b31] | committer: Michael Niedermayer
Merge commit '26bbc1c242ebfeec3c49585207efac7293632433' into release/2.2
* commit '26bbc1c242ebfeec3c49585207efac7293632433':
Prepare for 10 Release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9abe0bfb7f52d450c9c4b392d8c4b88007562b31
---
More information about the ffmpeg-cvslog
mailing list