ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Aug 
23 02:43:40 2014 +0200| [9e6d8c309f2763364ca2aaab801963a302bdfe82] | committer: 
Michael Niedermayer

Merge commit 'ee9e966296d74ca3836be5b5adc839cfc73d8c98' into release/2.2

* commit 'ee9e966296d74ca3836be5b5adc839cfc73d8c98':
  Update Changelog for v10.4
  Prepare for 10.4 Release

Conflicts:
        Changelog
        RELEASE

Not merged as these dont apply to FFmpeg

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e6d8c309f2763364ca2aaab801963a302bdfe82
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to