ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Mon Jun
1 14:45:08 2015 +0200| [9415ebfad6470344489ea71f37ab97bce0ad7058] | committer:
Michael Niedermayer
Merge commit 'e863f4cd2a5ea05c74b8beb92e55d7ed10908d64' into release/2.2
* commit 'e863f4cd2a5ea05c74b8beb92e55d7ed10908d64':
Update Changelog for 10.7
Conflicts:
Changelog
RELEASE
Not merged, as this isnt the changelog from between 2 ffmpeg versions
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9415ebfad6470344489ea71f37ab97bce0ad7058
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
