ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Sep 20 14:49:12 2014 +0200| [1aab0609968ea9dabf53a7ceab85b21954fe0cf1] | committer: Michael Niedermayer
Merge commit 'd0af7d5745f3e228293633faa9e57994f3308c31' into release/2.2 * commit 'd0af7d5745f3e228293633faa9e57994f3308c31': Update Changelog for v10.5 Prepare for 10.5 release Conflicts: Changelog RELEASE no change as FFmpeg releases dont match this Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1aab0609968ea9dabf53a7ceab85b21954fe0cf1 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog